Mesa (master): llvmpipe: Avoid variable size arrays.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Oct 22 18:12:29 UTC 2009


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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Oct 22 19:02:04 2009 +0100

llvmpipe: Avoid variable size arrays.

Not really variable size, but MSVC still doesn't like them.

---

 src/gallium/drivers/llvmpipe/lp_test.h       |    3 +++
 src/gallium/drivers/llvmpipe/lp_test_blend.c |    4 ++--
 src/gallium/drivers/llvmpipe/lp_test_conv.c  |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_test.h b/src/gallium/drivers/llvmpipe/lp_test.h
index a88e110..21016fe 100644
--- a/src/gallium/drivers/llvmpipe/lp_test.h
+++ b/src/gallium/drivers/llvmpipe/lp_test.h
@@ -56,6 +56,9 @@
 #include "lp_bld_type.h"
 
 
+#define LP_TEST_NUM_SAMPLES 32
+
+
 void
 write_tsv_header(FILE *fp);
 
diff --git a/src/gallium/drivers/llvmpipe/lp_test_blend.c b/src/gallium/drivers/llvmpipe/lp_test_blend.c
index 94b661d..e3af81c 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_blend.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_blend.c
@@ -477,8 +477,8 @@ test_one(unsigned verbose,
    char *error = NULL;
    blend_test_ptr_t blend_test_ptr;
    boolean success;
-   const unsigned n = 32;
-   int64_t cycles[n];
+   const unsigned n = LP_TEST_NUM_SAMPLES;
+   int64_t cycles[LP_TEST_NUM_SAMPLES];
    double cycles_avg = 0.0;
    unsigned i, j;
 
diff --git a/src/gallium/drivers/llvmpipe/lp_test_conv.c b/src/gallium/drivers/llvmpipe/lp_test_conv.c
index 9dcf58e..ac2a6d0 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_conv.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_conv.c
@@ -156,8 +156,8 @@ test_one(unsigned verbose,
    char *error = NULL;
    conv_test_ptr_t conv_test_ptr;
    boolean success;
-   const unsigned n = 32;
-   int64_t cycles[n];
+   const unsigned n = LP_TEST_NUM_SAMPLES;
+   int64_t cycles[LP_TEST_NUM_SAMPLES];
    double cycles_avg = 0.0;
    unsigned num_srcs;
    unsigned num_dsts;




More information about the mesa-commit mailing list