summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/mtypes.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index ac75ee553f7..7f9c30fc623 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2256,6 +2256,9 @@ struct gl_vertex_program_state
GLboolean Enabled; /**< User-set GL_VERTEX_PROGRAM_ARB/NV flag */
GLboolean PointSizeEnabled; /**< GL_VERTEX_PROGRAM_POINT_SIZE_ARB/NV */
GLboolean TwoSideEnabled; /**< GL_VERTEX_PROGRAM_TWO_SIDE_ARB/NV */
+ /** Should fixed-function T&L be implemented with a vertex prog? */
+ GLboolean _MaintainTnlProgram;
+
struct gl_program *Current; /**< User-bound vertex program */
/** Currently enabled and valid vertex program (including internal
@@ -2266,9 +2269,6 @@ struct gl_vertex_program_state
GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
- /** Should fixed-function T&L be implemented with a vertex prog? */
- GLboolean _MaintainTnlProgram;
-
/** Program to emulate fixed-function T&L (see above) */
struct gl_program *_TnlProgram;
@@ -2317,6 +2317,9 @@ struct gl_geometry_program_state
struct gl_fragment_program_state
{
GLboolean Enabled; /**< User-set fragment program enable flag */
+ /** Should fixed-function texturing be implemented with a fragment prog? */
+ GLboolean _MaintainTexEnvProgram;
+
struct gl_program *Current; /**< User-bound fragment program */
/** Currently enabled and valid fragment program (including internal
@@ -2327,9 +2330,6 @@ struct gl_fragment_program_state
GLfloat Parameters[MAX_PROGRAM_ENV_PARAMS][4]; /**< Env params */
- /** Should fixed-function texturing be implemented with a fragment prog? */
- GLboolean _MaintainTexEnvProgram;
-
/** Program to emulate fixed-function texture env/combine (see above) */
struct gl_program *_TexEnvProgram;