1 files changed, 12 insertions, 20 deletions
diff --git a/src/mesa/shader/shaderobjects_3dlabs.h b/src/mesa/shader/shaderobjects_3dlabs.h
index c18c7ffe94..d82079d8f3 100755
--- a/src/mesa/shader/shaderobjects_3dlabs.h
+++ b/src/mesa/shader/shaderobjects_3dlabs.h
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  6.5
  *
- * Copyright (C) 2006  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2005-2006  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"),
@@ -25,37 +25,29 @@
 #ifndef SHADEROBJECTS_3DLABS_H
 #define SHADEROBJECTS_3DLABS_H
 
-#include "mtypes.h"
+extern int _slang_fetch_discard (struct gl2_program_intf **pro, GLboolean *val);
 
+extern GLvoid _slang_exec_fragment_shader (struct gl2_program_intf **pro);
 
-extern int _slang_fetch_float(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, int write);
+extern GLvoid _slang_exec_vertex_shader (struct gl2_program_intf **pro);
 
-extern int _slang_fetch_vec3(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, int write);
+extern GLint _slang_get_uniform_location (struct gl2_program_intf **pro, const char *name);
 
-extern int _slang_fetch_vec4(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, GLuint index, int write);
+extern GLboolean _slang_write_uniform (struct gl2_program_intf **pro, GLint loc, GLsizei count,
+	const GLvoid *data, GLenum type);
 
-extern int _slang_fetch_vec4_f(struct gl2_fragment_shader_intf **fs, const char *name, GLfloat *val, GLuint index, int write);
+extern GLuint _slang_get_active_uniform_count (struct gl2_program_intf **pro);
 
-extern int _slang_fetch_mat3(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, GLuint index, int write);
-
-extern int _slang_fetch_mat4(struct gl2_vertex_shader_intf **vs, const char *name, GLfloat *val, GLuint index, int write);
-
-extern int _slang_fetch_discard(struct gl2_fragment_shader_intf **fs, GLboolean *val);
-
-extern GLint _slang_get_uniform_location(struct gl2_program_intf **pro, const char *name);
-
-extern GLboolean _slang_write_uniform(struct gl2_program_intf **pro, GLint loc, GLsizei count, const GLvoid *data, GLenum type);
-
-extern void _slang_exec_vertex_shader(struct gl2_vertex_shader_intf **vs);
-
-extern void _slang_exec_fragment_shader(struct gl2_fragment_shader_intf **fs);
+extern GLuint _slang_get_active_uniform_max_length (struct gl2_program_intf **pro);
 
+extern GLvoid _slang_get_active_uniform (struct gl2_program_intf **pro, GLuint index, GLsizei maxLength,
+	GLsizei *length, GLint *size, GLenum *type, char *name);
 
 extern GLhandleARB
 _mesa_3dlabs_create_shader_object (GLenum);
 
 extern GLhandleARB
-_mesa_3dlabs_create_program_object (void);
+_mesa_3dlabs_create_program_object (GLvoid);
 
 extern void
 _mesa_init_shaderobjects_3dlabs (GLcontext *ctx);