projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8cb6515
)
mesa: replace 8 with NUM_UNITS
author
Brian Paul
<brianp@vmware.com>
Wed, 2 Sep 2009 15:43:00 +0000
(09:43 -0600)
committer
Brian Paul
<brianp@vmware.com>
Wed, 2 Sep 2009 15:43:10 +0000
(09:43 -0600)
src/mesa/main/ffvertex_prog.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/ffvertex_prog.c
b/src/mesa/main/ffvertex_prog.c
index 8e21a27f897c08ff1c4ee5f0ea3b7e748149d40b..356476e35a5c5b90408a9f971ee4c103935a7e1b 100644
(file)
--- 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
];
};