diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
| commit | e158f8fc4a9cf2f884d156ff2dfc0870facfbcba (patch) | |
| tree | 9642a988d6674f27d6971ec2be7e2cdacc784862 /mesalib/src/mesa/main/bufferobj.c | |
| parent | ebfd1ae8f80dd16f99f9ef89c28a06f809d07f8d (diff) | |
| parent | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (diff) | |
| download | vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.gz vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.bz2 vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c index 2cf1217d5..fb5e15993 100644 --- a/mesalib/src/mesa/main/bufferobj.c +++ b/mesalib/src/mesa/main/bufferobj.c @@ -131,7 +131,7 @@ get_buffer(struct gl_context *ctx, const char *func, GLenum target) } -static inline GLenum +static inline GLbitfield default_access_mode(const struct gl_context *ctx) { /* Table 2.6 on page 31 (page 44 of the PDF) of the OpenGL 1.5 spec says: @@ -150,7 +150,7 @@ default_access_mode(const struct gl_context *ctx) * The difference is because GL_OES_mapbuffer only supports mapping buffers * write-only. */ - return (ctx->API == API_OPENGLES) + return _mesa_is_gles(ctx) ? GL_MAP_WRITE_BIT : (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT); } |