diff options
| author | marha <marha@users.sourceforge.net> | 2013-02-08 09:13:10 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-02-08 09:13:10 +0100 |
| commit | 71ff3367cab660035c6ea38e5171841dacd461b5 (patch) | |
| tree | fa8063ccfcd59ad1b7e92e374c2ce7229948a50c /mesalib/src/mesa | |
| parent | 49efd6bbf4c48770aea3654db1e7e90f4aa0dd06 (diff) | |
| parent | 212958ab41363d50d87470f6fb47bbcdc7a74c74 (diff) | |
| download | vcxsrv-71ff3367cab660035c6ea38e5171841dacd461b5.tar.gz vcxsrv-71ff3367cab660035c6ea38e5171841dacd461b5.tar.bz2 vcxsrv-71ff3367cab660035c6ea38e5171841dacd461b5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 8 Feb 2013
Conflicts:
updategit.sh
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/main/bufferobj.c | 7 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/get_hash_params.py | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index 89911fe51..ba464fe9f 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -2152,13 +2152,6 @@ _mesa_BindBufferRange(GLenum target, GLuint index, (int) size); return; } - - if (offset + size > bufObj->Size) { - _mesa_error(ctx, GL_INVALID_VALUE, - "glBindBufferRange(offset + size %d > buffer size %d)", - (int) (offset + size), (int) (bufObj->Size)); - return; - } } switch (target) { diff --git a/mesalib/src/mesa/main/get_hash_params.py b/mesalib/src/mesa/main/get_hash_params.py index b6bed809c..1b7d6ad8e 100644 --- a/mesalib/src/mesa/main/get_hash_params.py +++ b/mesalib/src/mesa/main/get_hash_params.py @@ -225,9 +225,6 @@ descriptor=[ # GL_OES_point_sprite [ "POINT_SPRITE_NV", "CONTEXT_BOOL(Point.PointSprite), extra_NV_point_sprite_ARB_point_sprite" ], - -# GL_ARB_vertex_shader - [ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_vertex_shader" ], ]}, @@ -362,6 +359,7 @@ descriptor=[ # GL_ARB_vertex_shader [ "MAX_VERTEX_UNIFORM_COMPONENTS_ARB", "CONTEXT_INT(Const.VertexProgram.MaxUniformComponents), extra_ARB_vertex_shader" ], + [ "MAX_VARYING_FLOATS_ARB", "LOC_CUSTOM, TYPE_INT, 0, extra_ARB_vertex_shader" ], # GL_EXT_framebuffer_blit # NOTE: GL_DRAW_FRAMEBUFFER_BINDING_EXT == GL_FRAMEBUFFER_BINDING_EXT |