diff options
| -rw-r--r-- | src/mesa/glapi/gl_API.xml | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/glapitable.h | 2 | ||||
| -rw-r--r-- | src/mesa/glapi/glapitemp.h | 2 | ||||
| -rw-r--r-- | src/mesa/sources | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/mesa/glapi/gl_API.xml b/src/mesa/glapi/gl_API.xml index 2a3c69a248d..97772c84f52 100644 --- a/src/mesa/glapi/gl_API.xml +++ b/src/mesa/glapi/gl_API.xml @@ -5528,7 +5528,7 @@ <param name="length" type="GLsizei *" output="true"/> <param name="size" type="GLint *" output="true"/> <param name="type" type="GLenum *" output="true"/> - <param name="name" type="const GLcharARB *"/> + <param name="name" type="GLcharARB *"/> </function> <function name="GetAttribLocationARB" offset="752"> diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h index 578bdfe0390..c00d74c4317 100644 --- a/src/mesa/glapi/glapitable.h +++ b/src/mesa/glapi/glapitable.h @@ -786,7 +786,7 @@ struct _glapi_table void (GLAPIENTRYP GetUniformivARB)(GLhandleARB programObj, GLint location, GLint * params); /* 748 */ void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * source); /* 749 */ void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB programObj, GLuint index, const GLcharARB * name); /* 750 */ - void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, const GLcharARB * name); /* 751 */ + void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 751 */ GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB programObj, const GLcharARB * name); /* 752 */ }; diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h index ebf5b124a17..c9dd6ca49b6 100644 --- a/src/mesa/glapi/glapitemp.h +++ b/src/mesa/glapi/glapitemp.h @@ -3825,7 +3825,7 @@ KEYWORD1 void KEYWORD2 NAME(BindAttribLocationARB)(GLhandleARB programObj, GLuin DISPATCH(BindAttribLocationARB, (programObj, index, name), (F, "glBindAttribLocationARB(%d, %d, %p);\n", programObj, index, (const void *) name)); } -KEYWORD1 void KEYWORD2 NAME(GetActiveAttribARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, const GLcharARB * name) +KEYWORD1 void KEYWORD2 NAME(GetActiveAttribARB)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name) { DISPATCH(GetActiveAttribARB, (programObj, index, maxLength, length, size, type, name), (F, "glGetActiveAttribARB(%d, %d, %d, %p, %p, %p, %p);\n", programObj, index, maxLength, (const void *) length, (const void *) size, (const void *) type, (const void *) name)); } diff --git a/src/mesa/sources b/src/mesa/sources index f82d344bf58..404249d0479 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -143,7 +143,8 @@ SHADER_SOURCES = \ shader/nvprogram.c \ shader/nvvertexec.c \ shader/nvvertparse.c \ - shader/program.c + shader/program.c \ + shader/shaderobjects.c ASM_C_SOURCES = \ x86/common_x86.c \ |