diff options
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/SConscript | 2 | ||||
| -rw-r--r-- | src/glx/dri2_glx.c | 10 | ||||
| -rw-r--r-- | src/glx/dri3_glx.c | 5 |
3 files changed, 7 insertions, 10 deletions
diff --git a/src/glx/SConscript b/src/glx/SConscript index b91c0bdd758..619e4c373ed 100644 --- a/src/glx/SConscript +++ b/src/glx/SConscript @@ -125,7 +125,7 @@ env.CodeGenerate( target = 'indirect_size.h', script = GLAPI + 'gen/glX_proto_size.py', source = sources, - command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set -h _INDIRECT_SIZE_H > $TARGET' + command = python_cmd + ' $SCRIPT -f $SOURCE -m size_h --only-set --header-tag _INDIRECT_SIZE_H > $TARGET' ) env.CodeGenerate( diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c index 538cf1adb82..27ea9521e50 100644 --- a/src/glx/dri2_glx.c +++ b/src/glx/dri2_glx.c @@ -1183,15 +1183,7 @@ dri2CreateScreen(int screen, struct glx_display * priv) return NULL; } -#ifdef O_CLOEXEC - psc->fd = open(deviceName, O_RDWR | O_CLOEXEC); - if (psc->fd == -1 && errno == EINVAL) -#endif - { - psc->fd = open(deviceName, O_RDWR); - if (psc->fd != -1) - fcntl(psc->fd, F_SETFD, fcntl(psc->fd, F_GETFD) | FD_CLOEXEC); - } + psc->fd = loader_open_device(deviceName); if (psc->fd < 0) { ErrorMessageF("failed to open drm device: %s\n", strerror(errno)); goto handle_error; diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c index ff77a91b15f..dfb0093395f 100644 --- a/src/glx/dri3_glx.c +++ b/src/glx/dri3_glx.c @@ -1985,6 +1985,11 @@ dri3_create_screen(int screen, struct glx_display * priv) goto handle_error; } + if (psc->is_different_gpu && !psc->image->blitImage) { + ErrorMessageF("Different GPU, but blitImage not implemented for this driver\n"); + goto handle_error; + } + if (!psc->is_different_gpu && ( !psc->texBuffer || psc->texBuffer->base.version < 2 || !psc->texBuffer->setTexBuffer2 |