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

"gl_" to match other structs.

1 files changed, 7 insertions, 7 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);
    }
 }