summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTapani Pälli <tapani.palli@intel.com>2017-09-04 08:02:13 +0300
committerTapani Pälli <tapani.palli@intel.com>2017-09-05 07:55:34 +0300
commit0986f686328216fa201769c630372fd4b6f8877a (patch)
treee6de37fea00e8c8b53009107c0c2f2be7a76bd37
parentbddf4a51c1bb86bdb14ed0693412c6a731ca1d3a (diff)
vbo: fix build errors on android
incompatible pointer to integer conversion assigning to 'GLintptr' (aka 'int') from 'const char *' [-Werror,-Wint-conversion] offset = indices; ^ ~~~~~~~ Fixes: 2d93b462b4d ("vbo: fix offset in minmax cache key") Signed-off-by: Tapani Pälli <tapani.palli@intel.com> Reviewed-by: Charmaine Lee <charmainel@vmware.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
-rw-r--r--src/mesa/vbo/vbo_minmax_index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/vbo/vbo_minmax_index.c b/src/mesa/vbo/vbo_minmax_index.c
index 58a2af49aca..1377926bbab 100644
--- a/src/mesa/vbo/vbo_minmax_index.c
+++ b/src/mesa/vbo/vbo_minmax_index.c
@@ -255,7 +255,7 @@ vbo_get_minmax_index(struct gl_context *ctx,
count, min_index, max_index))
return;
- offset = indices;
+ offset = (GLintptr) indices;
indices = ctx->Driver.MapBufferRange(ctx, offset, size,
GL_MAP_READ_BIT, ib->obj,
MAP_INTERNAL);