From 1ec88755c2d4498e5a5a515593855611a2505e7b Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Mon, 29 Jan 2018 01:35:17 +0200 Subject: [PATCH] vbo: provide 64bits support to print_draw_arrays MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Cc: Mathias Fröhlich Cc: Brian Paul Signed-off-by: Andres Gomez Reviewed-by: Mathias Fröhlich --- src/mesa/vbo/vbo_exec_array.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c index 74b9a1b0ebd..b30e044a879 100644 --- a/src/mesa/vbo/vbo_exec_array.c +++ b/src/mesa/vbo/vbo_exec_array.c @@ -284,15 +284,32 @@ print_draw_arrays(struct gl_context *ctx, MAP_INTERNAL); int offset = (int) (GLintptr) _mesa_vertex_attrib_address(array, binding); + + unsigned multiplier; + switch (array->Type) { + case GL_DOUBLE: + case GL_INT64_ARB: + case GL_UNSIGNED_INT64_ARB: + multiplier = 2; + break; + default: + multiplier = 1; + } + float *f = (float *) (p + offset); int *k = (int *) f; int i = 0; - int n = (count - 1) * (binding->Stride / 4) + array->Size; + int n = (count - 1) * (binding->Stride / (4 * multiplier)) + + array->Size; if (n > 32) n = 32; printf(" Data at offset %d:\n", offset); do { - printf(" float[%d] = 0x%08x %f\n", i, k[i], f[i]); + if (multiplier == 2) + printf(" double[%d] = 0x%016llx %lf\n", i, + ((unsigned long long *) k)[i], ((double *) f)[i]); + else + printf(" float[%d] = 0x%08x %f\n", i, k[i], f[i]); i++; } while (i < n); ctx->Driver.UnmapBuffer(ctx, bufObj, MAP_INTERNAL); -- 2.30.2