Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit

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

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index d994401e55f8086b538ef0eef145328ce1e388ad..32b1d4e9faf9c43ade2582d73fdeaff74a9b9b41 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -911,7 +911,7 @@ struct dd_function_table {
    void (*Uniform)(GLcontext *ctx, GLint location, GLsizei count,
                    const GLvoid *values, GLenum type);
    void (*UniformMatrix)(GLcontext *ctx, GLint cols, GLint rows,
-                         GLenum matrixType, GLint location, GLsizei count,
+                         GLint location, GLsizei count,
                          GLboolean transpose, const GLfloat *values);
    void (*UseProgram)(GLcontext *ctx, GLuint program);
    void (*ValidateProgram)(GLcontext *ctx, GLuint program);