Some structure renaming. Prefix vertex/fragment-related structs with

"gl_" to match other structs.

2 files changed, 14 insertions, 14 deletions

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index a2438813222..57b5364c8c1 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.5
+ * Version:  6.5.1
  *
  * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
@@ -208,11 +208,11 @@ _swrast_update_fog_state( GLcontext *ctx )
    swrast->_FogEnabled = GL_FALSE;
    if (ctx->FragmentProgram._Active) {
       if (ctx->FragmentProgram._Current->Base.Target==GL_FRAGMENT_PROGRAM_ARB) {
-         const struct fragment_program *p
-            = (struct fragment_program *) ctx->FragmentProgram._Current;
-         if (p->FogOption != GL_NONE) {
+         const struct gl_fragment_program *fp
+            = ctx->FragmentProgram._Current;
+         if (fp->FogOption != GL_NONE) {
             swrast->_FogEnabled = GL_TRUE;
-            swrast->_FogMode = p->FogOption;
+            swrast->_FogMode = fp->FogOption;
          }
       }
    }
@@ -231,8 +231,8 @@ static void
 _swrast_update_fragment_program( GLcontext *ctx )
 {
    if (ctx->FragmentProgram._Active) {
-      const struct fragment_program *program = ctx->FragmentProgram._Current;
-      _mesa_load_state_parameters(ctx, program->Base.Parameters);
+      const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
+      _mesa_load_state_parameters(ctx, fp->Base.Parameters);
    }
 }
 
diff --git a/src/mesa/swrast/s_nvfragprog.c b/src/mesa/swrast/s_nvfragprog.c
index 7c59a2bb594..fa16a41e289 100644
--- a/src/mesa/swrast/s_nvfragprog.c
+++ b/src/mesa/swrast/s_nvfragprog.c
@@ -106,7 +106,7 @@ static INLINE const GLfloat *
 get_register_pointer( GLcontext *ctx,
                       const struct prog_src_register *source,
                       const struct fp_machine *machine,
-                      const struct fragment_program *program )
+                      const struct gl_fragment_program *program )
 {
    const GLfloat *src;
    switch (source->File) {
@@ -153,7 +153,7 @@ static void
 fetch_vector4( GLcontext *ctx,
                const struct prog_src_register *source,
                const struct fp_machine *machine,
-               const struct fragment_program *program,
+               const struct gl_fragment_program *program,
                GLfloat result[4] )
 {
    const GLfloat *src = get_register_pointer(ctx, source, machine, program);
@@ -323,7 +323,7 @@ static void
 fetch_vector1( GLcontext *ctx,
                const struct prog_src_register *source,
                const struct fp_machine *machine,
-               const struct fragment_program *program,
+               const struct gl_fragment_program *program,
                GLfloat result[4] )
 {
    const GLfloat *src = get_register_pointer(ctx, source, machine, program);
@@ -477,7 +477,7 @@ store_vector4( const struct prog_instruction *inst,
 static void
 init_machine_deriv( GLcontext *ctx,
                     const struct fp_machine *machine,
-                    const struct fragment_program *program,
+                    const struct gl_fragment_program *program,
                     const struct sw_span *span, char xOrY,
                     struct fp_machine *dMachine )
 {
@@ -588,7 +588,7 @@ init_machine_deriv( GLcontext *ctx,
  */
 static GLboolean
 execute_program( GLcontext *ctx,
-                 const struct fragment_program *program, GLuint maxInst,
+                 const struct gl_fragment_program *program, GLuint maxInst,
                  struct fp_machine *machine, const struct sw_span *span,
                  GLuint column )
 {
@@ -1381,7 +1381,7 @@ execute_program( GLcontext *ctx,
 
 static void
 init_machine( GLcontext *ctx, struct fp_machine *machine,
-              const struct fragment_program *program,
+              const struct gl_fragment_program *program,
               const struct sw_span *span, GLuint col )
 {
    GLuint inputsRead = program->Base.InputsRead;
@@ -1452,7 +1452,7 @@ init_machine( GLcontext *ctx, struct fp_machine *machine,
 void
 _swrast_exec_fragment_program( GLcontext *ctx, struct sw_span *span )
 {
-   const struct fragment_program *program = ctx->FragmentProgram._Current;
+   const struct gl_fragment_program *program = ctx->FragmentProgram._Current;
    GLuint i;
 
    ctx->_CurrentProgram = GL_FRAGMENT_PROGRAM_ARB; /* or NV, doesn't matter */