mesa: Fix glCompressedTexImage when dstRowStride != srcRowStride.

[mesa.git] / src / mesa / main / shaderapi.h

diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index db316ab6a75c3d447fb3459d9806c9567ce9c45d..0ffebdb075f512c6fce393401dd8875fe63862d9 100644 (file)
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -28,9 +28,17 @@
 
 
 #include "glheader.h"
-#include "mtypes.h"
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+struct _glapi_table;
+struct gl_context;
+struct gl_shader_program;
+
 extern GLint
 _mesa_sizeof_glsl_type(GLenum type);
 
@@ -39,13 +47,20 @@ _mesa_copy_string(GLchar *dst, GLsizei maxLength,
                   GLsizei *length, const GLchar *src);
 
 extern void
-_mesa_use_program(struct gl_context *ctx, GLuint program);
+_mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg);
 
+extern void
+_mesa_active_program(struct gl_context *ctx, struct gl_shader_program *shProg,
+                    const char *caller);
 
 extern void
 _mesa_init_shader_dispatch(struct _glapi_table *exec);
 
+extern unsigned
+_mesa_count_active_attribs(struct gl_shader_program *shProg);
 
+extern size_t
+_mesa_longest_attribute_name_length(struct gl_shader_program *shProg);
 
 extern void GLAPIENTRY
 _mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
@@ -172,6 +187,9 @@ _mesa_ShaderBinary(GLint n, const GLuint *shaders, GLenum binaryformat,
 extern void GLAPIENTRY
 _mesa_ProgramParameteriARB(GLuint program, GLenum pname,
                            GLint value);
+void
+_mesa_use_shader_program(struct gl_context *ctx, GLenum type,
+                        struct gl_shader_program *shProg);
 
 extern void GLAPIENTRY
 _mesa_UseShaderProgramEXT(GLenum type, GLuint program);
@@ -182,4 +200,9 @@ _mesa_ActiveProgramEXT(GLuint program);
 extern GLuint GLAPIENTRY
 _mesa_CreateShaderProgramEXT(GLenum type, const GLchar *string);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* SHADERAPI_H */