Mesa (glsl2): mesa: Silence gcc warning "missing initializer for member".
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Sat Aug 14 14:17:47 UTC 2010
Module: Mesa
Branch: glsl2
Commit: 325aa1b3cd3fa2dcfc936d2024a4493c06f3b3f4
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=325aa1b3cd3fa2dcfc936d2024a4493c06f3b3f4
Author: José Fonseca <jfonseca at vmware.com>
Date: Sat Aug 14 14:38:09 2010 +0100
mesa: Silence gcc warning "missing initializer for member".
---
src/mesa/program/ir_to_mesa.cpp | 56 +++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 7490ffa..cf1fb91 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -980,51 +980,51 @@ static const struct {
bool array_indexed;
} statevars[] = {
{"gl_DepthRange", "near",
- {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_XXXX},
+ {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_XXXX, false},
{"gl_DepthRange", "far",
- {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_YYYY},
+ {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_YYYY, false},
{"gl_DepthRange", "diff",
- {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_ZZZZ},
+ {STATE_DEPTH_RANGE, 0, 0}, SWIZZLE_ZZZZ, false},
{"gl_ClipPlane", NULL,
{STATE_CLIPPLANE, 0, 0}, SWIZZLE_XYZW, true}
,
{"gl_Point", "size",
- {STATE_POINT_SIZE}, SWIZZLE_XXXX},
+ {STATE_POINT_SIZE}, SWIZZLE_XXXX, false},
{"gl_Point", "sizeMin",
- {STATE_POINT_SIZE}, SWIZZLE_YYYY},
+ {STATE_POINT_SIZE}, SWIZZLE_YYYY, false},
{"gl_Point", "sizeMax",
- {STATE_POINT_SIZE}, SWIZZLE_ZZZZ},
+ {STATE_POINT_SIZE}, SWIZZLE_ZZZZ, false},
{"gl_Point", "fadeThresholdSize",
- {STATE_POINT_SIZE}, SWIZZLE_WWWW},
+ {STATE_POINT_SIZE}, SWIZZLE_WWWW, false},
{"gl_Point", "distanceConstantAttenuation",
- {STATE_POINT_ATTENUATION}, SWIZZLE_XXXX},
+ {STATE_POINT_ATTENUATION}, SWIZZLE_XXXX, false},
{"gl_Point", "distanceLinearAttenuation",
- {STATE_POINT_ATTENUATION}, SWIZZLE_YYYY},
+ {STATE_POINT_ATTENUATION}, SWIZZLE_YYYY, false},
{"gl_Point", "distanceQuadraticAttenuation",
- {STATE_POINT_ATTENUATION}, SWIZZLE_ZZZZ},
+ {STATE_POINT_ATTENUATION}, SWIZZLE_ZZZZ, false},
{"gl_FrontMaterial", "emission",
- {STATE_MATERIAL, 0, STATE_EMISSION}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 0, STATE_EMISSION}, SWIZZLE_XYZW, false},
{"gl_FrontMaterial", "ambient",
- {STATE_MATERIAL, 0, STATE_AMBIENT}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 0, STATE_AMBIENT}, SWIZZLE_XYZW, false},
{"gl_FrontMaterial", "diffuse",
- {STATE_MATERIAL, 0, STATE_DIFFUSE}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 0, STATE_DIFFUSE}, SWIZZLE_XYZW, false},
{"gl_FrontMaterial", "specular",
- {STATE_MATERIAL, 0, STATE_SPECULAR}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 0, STATE_SPECULAR}, SWIZZLE_XYZW, false},
{"gl_FrontMaterial", "shininess",
- {STATE_MATERIAL, 0, STATE_SHININESS}, SWIZZLE_XXXX},
+ {STATE_MATERIAL, 0, STATE_SHININESS}, SWIZZLE_XXXX, false},
{"gl_BackMaterial", "emission",
- {STATE_MATERIAL, 1, STATE_EMISSION}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 1, STATE_EMISSION}, SWIZZLE_XYZW, false},
{"gl_BackMaterial", "ambient",
- {STATE_MATERIAL, 1, STATE_AMBIENT}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 1, STATE_AMBIENT}, SWIZZLE_XYZW, false},
{"gl_BackMaterial", "diffuse",
- {STATE_MATERIAL, 1, STATE_DIFFUSE}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 1, STATE_DIFFUSE}, SWIZZLE_XYZW, false},
{"gl_BackMaterial", "specular",
- {STATE_MATERIAL, 1, STATE_SPECULAR}, SWIZZLE_XYZW},
+ {STATE_MATERIAL, 1, STATE_SPECULAR}, SWIZZLE_XYZW, false},
{"gl_BackMaterial", "shininess",
- {STATE_MATERIAL, 1, STATE_SHININESS}, SWIZZLE_XXXX},
+ {STATE_MATERIAL, 1, STATE_SHININESS}, SWIZZLE_XXXX, false},
{"gl_LightSource", "ambient",
{STATE_LIGHT, 0, STATE_AMBIENT}, SWIZZLE_XYZW, true},
@@ -1052,12 +1052,12 @@ static const struct {
{STATE_LIGHT, 0, STATE_ATTENUATION}, SWIZZLE_ZZZZ, true},
{"gl_LightModel", NULL,
- {STATE_LIGHTMODEL_AMBIENT, 0}, SWIZZLE_XYZW},
+ {STATE_LIGHTMODEL_AMBIENT, 0}, SWIZZLE_XYZW, false},
{"gl_FrontLightModelProduct", NULL,
- {STATE_LIGHTMODEL_SCENECOLOR, 0}, SWIZZLE_XYZW},
+ {STATE_LIGHTMODEL_SCENECOLOR, 0}, SWIZZLE_XYZW, false},
{"gl_BackLightModelProduct", NULL,
- {STATE_LIGHTMODEL_SCENECOLOR, 1}, SWIZZLE_XYZW},
+ {STATE_LIGHTMODEL_SCENECOLOR, 1}, SWIZZLE_XYZW, false},
{"gl_FrontLightProduct", "ambient",
{STATE_LIGHTPROD, 0, 0, STATE_AMBIENT}, SWIZZLE_XYZW, true},
@@ -1095,15 +1095,15 @@ static const struct {
{STATE_TEXGEN, 0, STATE_TEXGEN_OBJECT_Q}, SWIZZLE_XYZW, true},
{"gl_Fog", "color",
- {STATE_FOG_COLOR}, SWIZZLE_XYZW},
+ {STATE_FOG_COLOR}, SWIZZLE_XYZW, false},
{"gl_Fog", "density",
- {STATE_FOG_PARAMS}, SWIZZLE_XXXX},
+ {STATE_FOG_PARAMS}, SWIZZLE_XXXX, false},
{"gl_Fog", "start",
- {STATE_FOG_PARAMS}, SWIZZLE_YYYY},
+ {STATE_FOG_PARAMS}, SWIZZLE_YYYY, false},
{"gl_Fog", "end",
- {STATE_FOG_PARAMS}, SWIZZLE_ZZZZ},
+ {STATE_FOG_PARAMS}, SWIZZLE_ZZZZ, false},
{"gl_Fog", "scale",
- {STATE_FOG_PARAMS}, SWIZZLE_WWWW},
+ {STATE_FOG_PARAMS}, SWIZZLE_WWWW, false},
};
static ir_to_mesa_src_reg
More information about the mesa-commit
mailing list