[Mesa-dev] [PATCH 1/3] glsl: add missing sceneColor field to gl_{Front, Back}LightModelProduct

Luca Barbieri luca at luca-barbieri.com
Wed Aug 18 03:52:55 PDT 2010


According to both GLSL 1.20 and 4.0, these are a struct with one field
called "sceneColor".

Fixes a crash on loading in FlightGear.
---
 src/mesa/program/ir_to_mesa.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 7de1939..1f3072f 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -1079,9 +1079,9 @@ static const struct {
    {"gl_LightModel", NULL,
     {STATE_LIGHTMODEL_AMBIENT, 0}, SWIZZLE_XYZW, false},
 
-   {"gl_FrontLightModelProduct", NULL,
+   {"gl_FrontLightModelProduct", "sceneColor",
     {STATE_LIGHTMODEL_SCENECOLOR, 0}, SWIZZLE_XYZW, false},
-   {"gl_BackLightModelProduct", NULL,
+   {"gl_BackLightModelProduct", "sceneColor",
     {STATE_LIGHTMODEL_SCENECOLOR, 1}, SWIZZLE_XYZW, false},
 
    {"gl_FrontLightProduct", "ambient",
-- 
1.7.0.4



More information about the mesa-dev mailing list