util: use standard name for strdup()

[mesa.git] / src / mesa / program / prog_execute.h

diff --git a/src/mesa/program/prog_execute.h b/src/mesa/program/prog_execute.h
index 346b7b6b36c5283f0a78be5cc953bc1114d08a40..ef04087301ecb2e26d74cbb95d90523a40c32d7a 100644 (file)
--- a/src/mesa/program/prog_execute.h
+++ b/src/mesa/program/prog_execute.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.0.3
  *
  * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
  *
@@ -27,8 +26,10 @@
 #define PROG_EXECUTE_H
 
 #include "main/config.h"
-#include "main/mtypes.h"
+#include "main/glheader.h"
+#include "compiler/shader_enums.h"
 
+struct gl_context;
 
 typedef void (*FetchTexelLodFunc)(struct gl_context *ctx, const GLfloat texcoord[4],
                                   GLfloat lambda, GLuint unit, GLfloat color[4]);
@@ -64,7 +65,6 @@ struct gl_program_machine
    GLfloat Temporaries[MAX_PROGRAM_TEMPS][4];
    GLfloat Outputs[MAX_PROGRAM_OUTPUTS][4];
    GLfloat (*EnvParams)[4]; /**< Vertex or Fragment env parameters */
-   GLuint CondCodes[4];  /**< COND_* value for x/y/z/w */
    GLint AddressReg[MAX_PROGRAM_ADDRESS_REGS][4];
    GLfloat SystemValues[SYSTEM_VALUE_MAX][4];
 
@@ -79,10 +79,6 @@ struct gl_program_machine
 };
 
 
-extern void
-_mesa_get_program_register(struct gl_context *ctx, gl_register_file file,
-                           GLuint index, GLfloat val[4]);
-
 extern GLboolean
 _mesa_execute_program(struct gl_context *ctx,
                       const struct gl_program *program,