projects
/
platform
/
upstream
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
04826cd
)
egl/dri2: Fix a weird conditional in dri2_make_current
author
Adam Jackson
<ajax@redhat.com>
Tue, 20 Sep 2022 21:50:42 +0000
(17:50 -0400)
committer
Marge Bot
<emma+marge@anholt.net>
Tue, 27 Sep 2022 16:00:45 +0000
(16:00 +0000)
It's not valid to get here with no context but with real surfaces.
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18824>
src/egl/drivers/dri2/egl_dri2.c
patch
|
blob
|
history
diff --git
a/src/egl/drivers/dri2/egl_dri2.c
b/src/egl/drivers/dri2/egl_dri2.c
index
356548e
..
c62e130
100644
(file)
--- a/
src/egl/drivers/dri2/egl_dri2.c
+++ b/
src/egl/drivers/dri2/egl_dri2.c
@@
-1825,7
+1825,7
@@
dri2_make_current(_EGLDisplay *disp, _EGLSurface *dsurf,
rdraw = (rsurf) ? dri2_dpy->vtbl->get_dri_drawable(rsurf) : NULL;
cctx = (dri2_ctx) ? dri2_ctx->dri_context : NULL;
- if (cctx
|| ddraw || rdraw
) {
+ if (cctx) {
if (!dri2_dpy->core->bindContext(cctx, ddraw, rdraw)) {
_EGLContext *tmp_ctx;