diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-08-09 09:27:54 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-08-09 09:27:54 +0300 |
| commit | b7f3fb0ef9d9d4885349806421f1145d2c5d7e6b (patch) | |
| tree | 0fe1b8658492a525fee21053f8a5cb9b6e293e50 /source/blender/gpu/intern/gpu_immediate.c | |
| parent | a77e77599dc2c250be0d3af6bf633d8e143623e4 (diff) | |
Gawain: fix Windows build error
MSVC is more strict than gcc or clang about pointer arithmetic. Also
fixed pointer cast warnings.
Diffstat (limited to 'source/blender/gpu/intern/gpu_immediate.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_immediate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/gpu/intern/gpu_immediate.c b/source/blender/gpu/intern/gpu_immediate.c index cea400a5f82..5e85c9a5374 100644 --- a/source/blender/gpu/intern/gpu_immediate.c +++ b/source/blender/gpu/intern/gpu_immediate.c @@ -174,7 +174,7 @@ void bind_attrib_locations(const VertexFormat* format, GLuint program) typedef struct { // current draw call - void* buffer_data; + GLubyte* buffer_data; unsigned buffer_offset; unsigned buffer_bytes_mapped; unsigned vertex_ct; @@ -182,7 +182,7 @@ typedef struct { // current vertex unsigned vertex_idx; - void* vertex_data; + GLubyte* vertex_data; unsigned short attrib_value_bits; // which attributes of current vertex have been given values? GLuint vbo_id; @@ -365,7 +365,7 @@ void immEnd() const Attrib* a = immVertexFormat.attribs + a_idx; const unsigned offset = imm.buffer_offset + a->offset; - const GLvoid* pointer = (const GLvoid*)0 + offset; + const GLvoid* pointer = (const GLubyte*)0 + offset; // printf("enabling attrib %u '%s' at offset %u, stride %u\n", a_idx, a->name, offset, stride); glEnableVertexAttribArray(a_idx); @@ -432,7 +432,7 @@ void immAttrib1f(unsigned attrib_id, float x) setAttribValueBit(attrib_id); - float* data = imm.vertex_data + attrib->offset; + float* data = (float*)(imm.vertex_data + attrib->offset); // printf("%s %ld %p\n", __FUNCTION__, (void*)data - imm.buffer_data, data); data[0] = x; @@ -452,7 +452,7 @@ void immAttrib2f(unsigned attrib_id, float x, float y) setAttribValueBit(attrib_id); - float* data = imm.vertex_data + attrib->offset; + float* data = (float*)(imm.vertex_data + attrib->offset); // printf("%s %ld %p\n", __FUNCTION__, (void*)data - imm.buffer_data, data); data[0] = x; @@ -473,7 +473,7 @@ void immAttrib3f(unsigned attrib_id, float x, float y, float z) setAttribValueBit(attrib_id); - float* data = imm.vertex_data + attrib->offset; + float* data = (float*)(imm.vertex_data + attrib->offset); // printf("%s %ld %p\n", __FUNCTION__, (void*)data - imm.buffer_data, data); data[0] = x; @@ -495,7 +495,7 @@ void immAttrib3ub(unsigned attrib_id, unsigned char r, unsigned char g, unsigned setAttribValueBit(attrib_id); - unsigned char* data = imm.vertex_data + attrib->offset; + GLubyte* data = imm.vertex_data + attrib->offset; // printf("%s %ld %p\n", __FUNCTION__, (void*)data - imm.buffer_data, data); data[0] = r; @@ -517,7 +517,7 @@ void immAttrib4ub(unsigned attrib_id, unsigned char r, unsigned char g, unsigned setAttribValueBit(attrib_id); - unsigned char* data = imm.vertex_data + attrib->offset; + GLubyte* data = imm.vertex_data + attrib->offset; // printf("%s %ld %p\n", __FUNCTION__, (void*)data - imm.buffer_data, data); data[0] = r; |