Module: Mesa Branch: master Commit: 0986f686328216fa201769c630372fd4b6f8877a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0986f686328216fa201769c630372fd4b6f8877a
Author: Tapani Pälli <[email protected]> Date: Mon Sep 4 08:02:13 2017 +0300 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 <[email protected]> Reviewed-by: Charmaine Lee <[email protected]> Reviewed-by: Emil Velikov <[email protected]> --- src/mesa/vbo/vbo_minmax_index.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/vbo/vbo_minmax_index.c b/src/mesa/vbo/vbo_minmax_index.c index 58a2af49ac..1377926bba 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); _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
