diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-05 09:16:39 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-05 09:16:39 +0100 |
| commit | 52fc95bab22331376f6a7351fdc07f805bd67610 (patch) | |
| tree | d93c6fce43dab496004a97a4dfc8bb38e5da6f5a /mesalib/src/mesa/main | |
| parent | 6e1f3114a922dc8ac7c1ae0c20d64b8f7a0f5ef7 (diff) | |
| parent | e82692e521240c5f8592f9ce56c9d5b3d68870ec (diff) | |
| download | vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.tar.gz vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.tar.bz2 vcxsrv-52fc95bab22331376f6a7351fdc07f805bd67610.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 5 dec 2012
Diffstat (limited to 'mesalib/src/mesa/main')
| -rw-r--r-- | mesalib/src/mesa/main/extensions.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 8 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/renderbuffer.c | 5 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/syncobj.c | 4 |
4 files changed, 12 insertions, 9 deletions
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c index 9e23a66d7..150d41e04 100644 --- a/mesalib/src/mesa/main/extensions.c +++ b/mesalib/src/mesa/main/extensions.c @@ -129,7 +129,7 @@ static const struct extension extension_table[] = { { "GL_ARB_texture_compression", o(dummy_true), GLL, 2000 }, { "GL_ARB_texture_compression_rgtc", o(ARB_texture_compression_rgtc), GL, 2004 }, { "GL_ARB_texture_cube_map", o(ARB_texture_cube_map), GLL, 1999 }, - { "GL_ARB_texture_cube_map_array", o(ARB_texture_cube_map_array), GLL, 2009 }, + { "GL_ARB_texture_cube_map_array", o(ARB_texture_cube_map_array), GL, 2009 }, { "GL_ARB_texture_env_add", o(dummy_true), GLL, 1999 }, { "GL_ARB_texture_env_combine", o(ARB_texture_env_combine), GLL, 2001 }, { "GL_ARB_texture_env_crossbar", o(ARB_texture_env_crossbar), GLL, 2001 }, @@ -308,7 +308,7 @@ static const struct extension extension_table[] = { { "GL_NV_light_max_exponent", o(dummy_true), GLL, 1999 }, { "GL_NV_packed_depth_stencil", o(EXT_packed_depth_stencil), GL, 2000 }, { "GL_NV_point_sprite", o(NV_point_sprite), GL, 2001 }, - { "GL_NV_primitive_restart", o(NV_primitive_restart), GL, 2002 }, + { "GL_NV_primitive_restart", o(NV_primitive_restart), GLL, 2002 }, { "GL_NV_read_buffer", o(dummy_true), ES2, 2011 }, { "GL_NV_texgen_reflection", o(dummy_true), GLL, 1999 }, { "GL_NV_texture_barrier", o(NV_texture_barrier), GL, 2009 }, diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index 9eec61de6..ce77b9f77 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -920,7 +920,9 @@ _mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer) /* ID was reserved, but no real renderbuffer object made yet */ newRb = NULL; } - else if (!newRb && ctx->Extensions.ARB_framebuffer_object) { + else if (!newRb + && _mesa_is_desktop_gl(ctx) + && ctx->Extensions.ARB_framebuffer_object) { /* All RB IDs must be Gen'd */ _mesa_error(ctx, GL_INVALID_OPERATION, "glBindRenderbuffer(buffer)"); return; @@ -1761,7 +1763,9 @@ _mesa_BindFramebuffer(GLenum target, GLuint framebuffer) /* ID was reserved, but no real framebuffer object made yet */ newDrawFb = NULL; } - else if (!newDrawFb && ctx->Extensions.ARB_framebuffer_object) { + else if (!newDrawFb + && _mesa_is_desktop_gl(ctx) + && ctx->Extensions.ARB_framebuffer_object) { /* All FBO IDs must be Gen'd */ _mesa_error(ctx, GL_INVALID_OPERATION, "glBindFramebuffer(buffer)"); return; diff --git a/mesalib/src/mesa/main/renderbuffer.c b/mesalib/src/mesa/main/renderbuffer.c index 2f2844329..b42616226 100644 --- a/mesalib/src/mesa/main/renderbuffer.c +++ b/mesalib/src/mesa/main/renderbuffer.c @@ -160,10 +160,7 @@ _mesa_reference_renderbuffer_(struct gl_renderbuffer **ptr, if (deleteFlag) { GET_CURRENT_CONTEXT(ctx); - if (ctx) - oldRb->Delete(ctx, oldRb); - else - _mesa_problem(NULL, "Unable to delete renderbuffer, no context"); + oldRb->Delete(ctx, oldRb); } *ptr = NULL; diff --git a/mesalib/src/mesa/main/syncobj.c b/mesalib/src/mesa/main/syncobj.c index 847612c3b..598414596 100644 --- a/mesalib/src/mesa/main/syncobj.c +++ b/mesalib/src/mesa/main/syncobj.c @@ -55,6 +55,7 @@ * \author Ian Romanick <ian.d.romanick@intel.com> */ +#include <inttypes.h> #include "glheader.h" #include "imports.h" #include "context.h" @@ -357,7 +358,8 @@ _mesa_WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) } if (timeout != GL_TIMEOUT_IGNORED) { - _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%lx)", timeout); + _mesa_error(ctx, GL_INVALID_VALUE, "glWaitSync(timeout=0x%" PRIx64 ")", + (uint64_t) timeout); return; } |