Mesa (master): gallium: Make pipe_query_result:: batch array length non-zero.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Nov 27 14:14:28 UTC 2015


Module: Mesa
Branch: master
Commit: c127e6a3ea93e09259f3ef7e44f5f147e7427418
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c127e6a3ea93e09259f3ef7e44f5f147e7427418

Author: Jose Fonseca <jfonseca at vmware.com>
Date:   Wed Nov 25 13:33:08 2015 +0000

gallium: Make pipe_query_result::batch array length non-zero.

Zero length arrays are non standard:

   warning C4200: nonstandard extension used : zero-sized array in struct/union
   Cannot generate copy-ctor or copy-assignment operator when UDT contains a zero-sized array

And all code does `N * sizeof query_result->batch[0]`, so it should work
exactly the same.

Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/gallium/include/pipe/p_defines.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index b18eedd..cbf0ba6 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -822,8 +822,8 @@ union pipe_query_result
    /* PIPE_QUERY_PIPELINE_STATISTICS */
    struct pipe_query_data_pipeline_statistics pipeline_statistics;
 
-   /* batch queries */
-   union pipe_numeric_type_union batch[0];
+   /* batch queries (variable length) */
+   union pipe_numeric_type_union batch[1];
 };
 
 union pipe_color_union




More information about the mesa-commit mailing list