summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2021-02-23 15:28:40 -0500
committerMarge Bot <eric+marge@anholt.net>2021-04-16 06:50:35 +0000
commitd53fc2240b6b012951692e172682d6799d78b802 (patch)
tree0c923f6c682204a484b390a9bb883a0898214890
parent1cf36797bf9d63b33c405d85ce720dcd5e75a47c (diff)
glx/drisw: Enable GLX_ARB_create_context_no_error
Detect this the same way as we do for drihw. Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Acked-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9233>
-rw-r--r--src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt2
-rw-r--r--src/gallium/drivers/softpipe/ci/softpipe-quick.txt2
-rw-r--r--src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt1
-rw-r--r--src/glx/drisw_glx.c4
4 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt
index 326ec8323a9..d6d0295a3c0 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt
@@ -1,5 +1,4 @@
fast_color_clear/fcc-clear-tex: skip
-glx/extension string sanity: fail
glx/glx-buffer-age: skip
glx/glx-buffer-age vblank_mode=0: skip
glx/glx-copy-sub-buffer: fail
@@ -29,7 +28,6 @@ glx/glx-visuals-stencil: fail
glx/glx-visuals-stencil -pixmap: fail
glx/glx_arb_create_context/invalid flag: fail
glx/glx_arb_create_context_es2_profile/invalid opengl es version: fail
-glx/glx_arb_create_context_no_error/no error: skip
glx/glx_arb_create_context_robustness/invalid reset notification strategy: skip
glx/glx_arb_create_context_robustness/require gl_arb_robustness: skip
glx/glx_arb_sync_control/glxgetmscrateoml: skip
diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
index 45de3631706..e26e3183107 100644
--- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
@@ -1,7 +1,6 @@
fast_color_clear/fcc-clear-tex: skip
fast_color_clear/fcc-front-buffer-distraction: crash
fast_color_clear/fcc-write-after-clear: skip
-glx/extension string sanity: fail
glx/glx-buffer-age: skip
glx/glx-buffer-age vblank_mode=0: skip
glx/glx-copy-sub-buffer samples=16: skip
@@ -30,7 +29,6 @@ glx/glx-visuals-depth -pixmap: fail
glx/glx-visuals-stencil: fail
glx/glx-visuals-stencil -pixmap: fail
glx/glx_arb_create_context_es2_profile/invalid opengl es version: fail
-glx/glx_arb_create_context_no_error/no error: skip
glx/glx_arb_create_context_robustness/invalid reset notification strategy: skip
glx/glx_arb_create_context_robustness/require gl_arb_robustness: skip
glx/glx_arb_sync_control/glxgetmscrateoml: skip
diff --git a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
index 401960d260a..7dde57c1477 100644
--- a/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
+++ b/src/gallium/drivers/zink/ci/piglit-zink-lvp-fails.txt
@@ -1,4 +1,3 @@
-glx@extension string sanity,Fail
glx@glx-copy-sub-buffer,Fail
glx@glx-copy-sub-buffer samples=2,Fail
glx@glx-copy-sub-buffer samples=4,Fail
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index 8227b7d72fd..355d8026977 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -783,6 +783,10 @@ driswBindExtensions(struct drisw_screen *psc, const __DRIextension **extensions)
__glXEnableDirectExtension(&psc->base,
"GLX_ARB_context_flush_control");
}
+
+ if (strcmp(extensions[i]->name, __DRI2_NO_ERROR) == 0)
+ __glXEnableDirectExtension(&psc->base,
+ "GLX_ARB_create_context_no_error");
}
}