From 34c808287e17c835c2fca1853046bbcbf66a2e5b Mon Sep 17 00:00:00 2001 From: Mike Erwin Date: Thu, 27 Apr 2017 09:59:19 -0400 Subject: [PATCH] Gawain: fix pointer arithmetic warning void* + offset = ??? This Mac-only code works, but wasn't strictly correct. clang doesn't warn about this, gcc does. --- intern/gawain/src/immediate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intern/gawain/src/immediate.c b/intern/gawain/src/immediate.c index 9265d30e083..0cf24668b10 100644 --- a/intern/gawain/src/immediate.c +++ b/intern/gawain/src/immediate.c @@ -222,7 +222,7 @@ void immBegin(PrimitiveType prim_type, unsigned vertex_ct) // printf("mapping %u to %u\n", imm.buffer_offset, imm.buffer_offset + bytes_needed - 1); #if APPLE_LEGACY - imm.buffer_data = glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY) + imm.buffer_offset; + imm.buffer_data = (GLubyte*)glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY) + imm.buffer_offset; #else imm.buffer_data = glMapBufferRange(GL_ARRAY_BUFFER, imm.buffer_offset, bytes_needed, GL_MAP_WRITE_BIT | GL_MAP_UNSYNCHRONIZED_BIT | (imm.strict_vertex_ct ? 0 : GL_MAP_FLUSH_EXPLICIT_BIT));