replace color table FloatTable boolean with Type enum

[mesa.git] / src / mesa / main / arbfragparse.c

diff --git a/src/mesa/main/arbfragparse.c b/src/mesa/main/arbfragparse.c
index 9a986b4a835efcc7ed043b9347b3227634eed63e..bce8732f252448c1fe1fc5049e08cf03e323b374 100644 (file)
--- a/src/mesa/main/arbfragparse.c
+++ b/src/mesa/main/arbfragparse.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -206,25 +206,26 @@ _mesa_parse_arb_fragment_program(GLcontext * ctx, GLenum target,
    program->NumTexInstructions = ap.NumTexInstructions;
    program->NumTexIndirections = ap.NumTexIndirections;
    program->Parameters         = ap.Parameters;
+   program->FogOption          = ap.FogOption;
 
    /* XXX: Parse error. Cleanup things and return */   
    if (retval)
    {
       program->Instructions = (struct fp_instruction *) _mesa_malloc (
-                                     sizeof(struct fp_instruction) );                    
+                                     sizeof(struct fp_instruction) );
       program->Instructions[0].Opcode = FP_OPCODE_END;
       return;
    }
 
    /* XXX: Eh.. we parsed something that wasn't a fragment program. doh! */
-   if (ap.type != GL_FRAGMENT_PROGRAM_ARB)
+   if (ap.Base.Target != GL_FRAGMENT_PROGRAM_ARB)
    {
       program->Instructions = (struct fp_instruction *) _mesa_malloc (
-                                     sizeof(struct fp_instruction) );                    
+                                     sizeof(struct fp_instruction) );
       program->Instructions[0].Opcode = FP_OPCODE_END;
 
       _mesa_error (ctx, GL_INVALID_OPERATION, "Parsed a non-fragment program as a fragment program");
-      return;      
+      return;
    }
 
 #if DEBUG_FP