diff options
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/GL3x.xml | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/dri_util.c | 57 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/fbobject.c | 9 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/queryobj.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texparam.c | 2 |
5 files changed, 38 insertions, 35 deletions
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml index 5949d3e1d..9ca3bbacb 100644 --- a/mesalib/src/mapi/glapi/gen/GL3x.xml +++ b/mesalib/src/mapi/glapi/gen/GL3x.xml @@ -605,8 +605,7 @@ <param name="data" type="GLint64 *"/> </function> - <function name="GetBufferParameteri64v" offset="assign" es2="3.0" - exec="skip"> + <function name="GetBufferParameteri64v" offset="assign" es2="3.0"> <param name="target" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint64 *"/> diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c index 983bbea49..917b9465b 100644 --- a/mesalib/src/mesa/drivers/dri/common/dri_util.c +++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c @@ -563,40 +563,43 @@ dri2GetAPIMask(__DRIscreen *screen) /** Core interface */ const __DRIcoreExtension driCoreExtension = { - { __DRI_CORE, __DRI_CORE_VERSION }, - NULL, - driDestroyScreen, - driGetExtensions, - driGetConfigAttrib, - driIndexConfigAttrib, - NULL, - driDestroyDrawable, - NULL, - NULL, - driCopyContext, - driDestroyContext, - driBindContext, - driUnbindContext + .base = { __DRI_CORE, __DRI_CORE_VERSION }, + + .createNewScreen = NULL, + .destroyScreen = driDestroyScreen, + .getExtensions = driGetExtensions, + .getConfigAttrib = driGetConfigAttrib, + .indexConfigAttrib = driIndexConfigAttrib, + .createNewDrawable = NULL, + .destroyDrawable = driDestroyDrawable, + .swapBuffers = NULL, + .createNewContext = NULL, + .copyContext = driCopyContext, + .destroyContext = driDestroyContext, + .bindContext = driBindContext, + .unbindContext = driUnbindContext }; /** DRI2 interface */ const __DRIdri2Extension driDRI2Extension = { - { __DRI_DRI2, 3 }, - dri2CreateNewScreen, - dri2CreateNewDrawable, - dri2CreateNewContext, - dri2GetAPIMask, - dri2CreateNewContextForAPI, - dri2AllocateBuffer, - dri2ReleaseBuffer, - dri2CreateContextAttribs + .base = { __DRI_DRI2, 3 }, + + .createNewScreen = dri2CreateNewScreen, + .createNewDrawable = dri2CreateNewDrawable, + .createNewContext = dri2CreateNewContext, + .getAPIMask = dri2GetAPIMask, + .createNewContextForAPI = dri2CreateNewContextForAPI, + .allocateBuffer = dri2AllocateBuffer, + .releaseBuffer = dri2ReleaseBuffer, + .createContextAttribs = dri2CreateContextAttribs }; const __DRI2configQueryExtension dri2ConfigQueryExtension = { - { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION }, - dri2ConfigQueryb, - dri2ConfigQueryi, - dri2ConfigQueryf, + .base = { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION }, + + .configQueryb = dri2ConfigQueryb, + .configQueryi = dri2ConfigQueryi, + .configQueryf = dri2ConfigQueryf, }; void diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c index ef739c162..223aef18d 100644 --- a/mesalib/src/mesa/main/fbobject.c +++ b/mesalib/src/mesa/main/fbobject.c @@ -31,6 +31,7 @@ * Brian Paul */ +#include <stdbool.h> #include "buffers.h" #include "context.h" @@ -162,13 +163,13 @@ invalidate_framebuffer(struct gl_framebuffer *fb) static struct gl_framebuffer * get_framebuffer_target(struct gl_context *ctx, GLenum target) { + bool have_fb_blit = _mesa_is_gles3(ctx) || + (ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx)); switch (target) { case GL_DRAW_FRAMEBUFFER: - return ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx) - ? ctx->DrawBuffer : NULL; + return have_fb_blit ? ctx->DrawBuffer : NULL; case GL_READ_FRAMEBUFFER: - return ctx->Extensions.EXT_framebuffer_blit && _mesa_is_desktop_gl(ctx) - ? ctx->ReadBuffer : NULL; + return have_fb_blit ? ctx->ReadBuffer : NULL; case GL_FRAMEBUFFER_EXT: return ctx->DrawBuffer; default: diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c index 55d3681c1..20799e843 100644 --- a/mesalib/src/mesa/main/queryobj.c +++ b/mesalib/src/mesa/main/queryobj.c @@ -321,7 +321,7 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id) q = _mesa_lookup_query_object(ctx, id); if (!q) { - if (ctx->API == API_OPENGL_CORE) { + if (ctx->API != API_OPENGL) { _mesa_error(ctx, GL_INVALID_OPERATION, "glBeginQuery{Indexed}(non-gen name)"); return; diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index 8ce054618..92c89102f 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -349,7 +349,7 @@ set_tex_parameteri(struct gl_context *ctx, if (texObj->MaxLevel == params[0]) return GL_FALSE; if (params[0] < 0 || texObj->Target == GL_TEXTURE_RECTANGLE_ARB) { - _mesa_error(ctx, GL_INVALID_OPERATION, + _mesa_error(ctx, GL_INVALID_VALUE, "glTexParameter(param=%d)", params[0]); return GL_FALSE; } |