diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-20 10:51:44 +0200 |
| commit | 5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch) | |
| tree | b7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/src/mesa/main/bufferobj.c | |
| parent | 97f357506241a5314de9071befcd01be731f1dbb (diff) | |
| parent | 0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff) | |
| download | vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2 vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/bufferobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/bufferobj.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index 428384b35..45e72045a 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -1376,6 +1376,17 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, return NULL; } + if (access & ~(GL_MAP_READ_BIT | + GL_MAP_WRITE_BIT | + GL_MAP_INVALIDATE_RANGE_BIT | + GL_MAP_INVALIDATE_BUFFER_BIT | + GL_MAP_FLUSH_EXPLICIT_BIT | + GL_MAP_UNSYNCHRONIZED_BIT)) { + /* generate an error if any undefind bit is set */ + _mesa_error(ctx, GL_INVALID_VALUE, "glMapBufferRange(access)"); + return NULL; + } + if ((access & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT)) == 0) { _mesa_error(ctx, GL_INVALID_OPERATION, "glMapBufferRange(access indicates neither read or write)"); |