From: Brian Paul <brianp@vmware.com>
Date: Wed, 2 Sep 2009 15:43:00 +0000 (-0600)
Subject: mesa: replace 8 with NUM_UNITS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a7a3d3c27144595b2134f4271996cba901938d12;p=mesa.git

mesa: replace 8 with NUM_UNITS
---

diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 8e21a27f897..356476e35a5 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -46,6 +46,9 @@
 #include "shader/prog_statevars.h"
 
 
+/** Max of number of lights and texture coord units */
+#define NUM_UNITS MAX2(MAX_TEXTURE_COORD_UNITS, MAX_LIGHTS)
+
 struct state_key {
    unsigned light_color_material_mask:12;
    unsigned light_global_enabled:1;
@@ -77,7 +80,7 @@ struct state_key {
       unsigned texgen_mode1:4;
       unsigned texgen_mode2:4;
       unsigned texgen_mode3:4;
-   } unit[8];
+   } unit[NUM_UNITS];
 };