diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-28 08:08:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-28 08:08:21 +0200 |
| commit | 67551627d34fff4a0fbe719bce33a3bacb55ccef (patch) | |
| tree | 37b58281a1186148a56dbb3b9eed6eaf759cbe7b /mesalib/src/mesa/vbo | |
| parent | 7baa3d795c87c11550f1686488c968320428cbf9 (diff) | |
| download | vcxsrv-67551627d34fff4a0fbe719bce33a3bacb55ccef.tar.gz vcxsrv-67551627d34fff4a0fbe719bce33a3bacb55ccef.tar.bz2 vcxsrv-67551627d34fff4a0fbe719bce33a3bacb55ccef.zip | |
xkeyboard-config mesa fontconfig randrproto git update 28 Jun 2012
Diffstat (limited to 'mesalib/src/mesa/vbo')
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_exec_api.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_exec_array.c | 5 | ||||
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_noop.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/vbo/vbo_save_api.c | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/mesalib/src/mesa/vbo/vbo_exec_api.c b/mesalib/src/mesa/vbo/vbo_exec_api.c index bfa1b1db8..fc7e40692 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_api.c +++ b/mesalib/src/mesa/vbo/vbo_exec_api.c @@ -450,7 +450,7 @@ vbo_Materialfv(GLenum face, GLenum pname, const GLfloat *params) * indicating which material attributes can actually be updated below. */ if (ctx->Light.ColorMaterialEnabled) { - updateMats = ~ctx->Light.ColorMaterialBitmask; + updateMats = ~ctx->Light._ColorMaterialBitmask; } else { /* GL_COLOR_MATERIAL is disabled so don't skip any material updates */ diff --git a/mesalib/src/mesa/vbo/vbo_exec_array.c b/mesalib/src/mesa/vbo/vbo_exec_array.c index ebf008536..6f6a2983a 100644 --- a/mesalib/src/mesa/vbo/vbo_exec_array.c +++ b/mesalib/src/mesa/vbo/vbo_exec_array.c @@ -1149,7 +1149,8 @@ vbo_exec_DrawElementsInstancedBaseVertexBaseInstance(GLenum mode, GLsizei count, static void vbo_validated_multidrawelements(struct gl_context *ctx, GLenum mode, const GLsizei *count, GLenum type, - const GLvoid **indices, GLsizei primcount, + const GLvoid * const *indices, + GLsizei primcount, const GLint *basevertex) { struct vbo_context *vbo = vbo_context(ctx); @@ -1290,7 +1291,7 @@ vbo_exec_MultiDrawElements(GLenum mode, static void GLAPIENTRY vbo_exec_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, - const GLvoid **indices, + const GLvoid * const *indices, GLsizei primcount, const GLsizei *basevertex) { diff --git a/mesalib/src/mesa/vbo/vbo_noop.c b/mesalib/src/mesa/vbo/vbo_noop.c index 430011207..2f472c21c 100644 --- a/mesalib/src/mesa/vbo/vbo_noop.c +++ b/mesalib/src/mesa/vbo/vbo_noop.c @@ -404,7 +404,7 @@ _mesa_noop_DrawRangeElementsBaseVertex(GLenum mode, static void GLAPIENTRY _mesa_noop_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei * count, GLenum type, - const GLvoid ** indices, + const GLvoid * const *indices, GLsizei primcount, const GLint * basevertex) { diff --git a/mesalib/src/mesa/vbo/vbo_save_api.c b/mesalib/src/mesa/vbo/vbo_save_api.c index b2c9dd5f0..d27525812 100644 --- a/mesalib/src/mesa/vbo/vbo_save_api.c +++ b/mesalib/src/mesa/vbo/vbo_save_api.c @@ -1042,7 +1042,7 @@ _save_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, static void GLAPIENTRY _save_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, - GLenum type, const GLvoid **indices, + GLenum type, const GLvoid * const *indices, GLsizei primcount, const GLint *basevertex) { GET_CURRENT_CONTEXT(ctx); @@ -1255,7 +1255,7 @@ _save_OBE_MultiDrawElements(GLenum mode, const GLsizei *count, GLenum type, static void GLAPIENTRY _save_OBE_MultiDrawElementsBaseVertex(GLenum mode, const GLsizei *count, GLenum type, - const GLvoid **indices, + const GLvoid * const *indices, GLsizei primcount, const GLint *basevertex) { |