fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

glx: Propagate the glXIsDirect protocol error back to the application

Browse source 
If the server returned BadContext, the error would just get droped on
the floor.

Fixes the piglit test glx-import-context-single-process

NOTE: This is a candidate for the 7.11 branch, but it also requires
the previous patch.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Ian Romanick 2011-12-07 16:13:02 -08:00
parent fba400072f
commit ed4a65c3cf
1 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/glx/glxcmds.c
View file

@ -37,12 +37,12 @@
#include "glapi.h"
#include "glxextensions.h"
#include "indirect.h"
#include "glx_error.h"
#ifdef GLX_DIRECT_RENDERING
#ifdef GLX_USE_APPLEGL
#include "apple_glx_context.h"
#include "apple_glx.h"
#include "glx_error.h"
#else
#include <sys/time.h>
#ifdef XF86VIDMODE
@ -589,12 +589,19 @@ __glXIsDirect(Display * dpy, GLXContextID contextID)
#ifdef USE_XCB
xcb_connection_t *c = XGetXCBConnection(dpy);
xcb_generic_error_t *err;
xcb_glx_is_direct_reply_t *reply = xcb_glx_is_direct_reply(c,
xcb_glx_is_direct
(c, contextID),
NULL);
&err);
const Bool is_direct = (reply != NULL && reply->is_direct) ? True : False;
if (err != NULL) {
__glXSendErrorForXcb(dpy, err);
free(err);
}
free(reply);
return is_direct;
@ -1429,7 +1436,23 @@ glXImportContextEXT(Display *dpy, GLXContextID contextID)
uint32_t screen;
Bool got_screen = False;
if (contextID == None || __glXIsDirect(dpy, contextID))
/* The GLX_EXT_import_context spec says:
*
* "If <contextID> does not refer to a valid context, then a BadContext
* error is generated; if <contextID> refers to direct rendering
* context then no error is generated but glXImportContextEXT returns
* NULL."
*
* If contextID is None, generate BadContext on the client-side. Other
* sorts of invalid contexts will be detected by the server in the
* __glXIsDirect call.
*/
if (contextID == None) {
__glXSendError(dpy, GLXBadContext, contextID, X_GLXIsDirect, false);
return NULL;
}
if (__glXIsDirect(dpy, contextID))
return NULL;
opcode = __glXSetupForCommand(dpy);