From: Luca Barbieri <luca@luca-barbieri.com>
Date: Wed, 18 Aug 2010 10:52:55 +0000 (+0200)
Subject: glsl: add missing sceneColor field to gl_{Front, Back}LightModelProduct
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c108a7927d1dad9e0f641a0ec5a7387fb2626156;p=mesa.git

glsl: add missing sceneColor field to gl_{Front, Back}LightModelProduct

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.
---

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index fafc6200bed..1fbf574bc8b 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",