Mesa (master): mesa/main/ff_frag: Use correct constant.

Marek Olšák mareko at kemper.freedesktop.org
Sat Apr 8 20:08:02 UTC 2017


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

Author: Gustaw Smolarczyk <wielkiegie at gmail.com>
Date:   Thu Mar 30 20:09:20 2017 +0200

mesa/main/ff_frag: Use correct constant.

Since fixed-function shaders are restricted to MAX_TEXTURE_COORD_UNITS
texture units, use this constant instead of MAX_TEXTURE_UNITS. This
reduces the array size from 32 to 8.

Signed-off-by: Gustaw Smolarczyk <wielkiegie at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Signed-off-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/main/ff_fragment_shader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index f007ac3b40..7679328d4c 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -123,7 +123,7 @@ struct state_key {
 
       struct mode_opt OptRGB[MAX_COMBINER_TERMS];
       struct mode_opt OptA[MAX_COMBINER_TERMS];
-   } unit[MAX_TEXTURE_UNITS];
+   } unit[MAX_TEXTURE_COORD_UNITS];
 };
 
 #define FOG_NONE    0




More information about the mesa-commit mailing list