projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
27e6552
)
glsl: add missing sceneColor field to gl_{Front, Back}LightModelProduct
author
Luca Barbieri
<luca@luca-barbieri.com>
Wed, 18 Aug 2010 10:52:55 +0000
(12:52 +0200)
committer
Kenneth Graunke
<kenneth@whitecape.org>
Fri, 20 Aug 2010 20:01:04 +0000
(13:01 -0700)
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
patch
|
blob
|
history
diff --git
a/src/mesa/program/ir_to_mesa.cpp
b/src/mesa/program/ir_to_mesa.cpp
index fafc6200bed44e795e169ff79a94b024934abed6..1fbf574bc8b1d6b9c29ce5786eab3f9170570bd4 100644
(file)
--- 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",