From 9f4ab0684241950b2227808e2f7b903ce8104c02 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 12 Nov 2024 17:11:03 +0100 Subject: [PATCH] glx: return BadMatch for invalid reset notification strategy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The specification doesn't say which error should be reported, but piglit expects BadMatch: /* The GLX_ARB_create_context_robustness spec does not say what error * code should be generated. However, similar cases (e.g., valid GL * versions) specify BadMatch. This is also the behavior of NVIDIA's * closed-source driver. */ Reviewed-by: Marek Olšák Part-of: --- src/amd/ci/radeonsi-raven-fails.txt | 1 - src/amd/ci/radeonsi-stoney-fails.txt | 1 - src/freedreno/ci/freedreno-a307-fails.txt | 1 - src/freedreno/ci/freedreno-a530-fails.txt | 1 - src/freedreno/ci/freedreno-a618-fails.txt | 1 - src/freedreno/ci/freedreno-a630-fails.txt | 1 - src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv | 1 - src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv | 1 - src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv | 1 - src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv | 1 - src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv | 1 - src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv | 1 - src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv | 1 - src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv | 1 - src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt | 1 - src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt | 1 - src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt | 1 - src/glx/dri_common.c | 2 +- src/intel/ci/iris-kbl-fails.txt | 3 --- 19 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/amd/ci/radeonsi-raven-fails.txt b/src/amd/ci/radeonsi-raven-fails.txt index 028a6c94d5a..3478c157dad 100644 --- a/src/amd/ci/radeonsi-raven-fails.txt +++ b/src/amd/ci/radeonsi-raven-fails.txt @@ -4,7 +4,6 @@ glx@glx-swap-event_async,Fail glx@glx-swap-pixmap-bad,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail spec@!opengl 1.0@rasterpos@glsl_vs_tes_linked,Fail diff --git a/src/amd/ci/radeonsi-stoney-fails.txt b/src/amd/ci/radeonsi-stoney-fails.txt index 964dd1a95a7..cb8b28cf0df 100644 --- a/src/amd/ci/radeonsi-stoney-fails.txt +++ b/src/amd/ci/radeonsi-stoney-fails.txt @@ -2,7 +2,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-swap-pixmap-bad,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail diff --git a/src/freedreno/ci/freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt index fea28360db7..75fb6ce3b74 100644 --- a/src/freedreno/ci/freedreno-a307-fails.txt +++ b/src/freedreno/ci/freedreno-a307-fails.txt @@ -161,7 +161,6 @@ glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail shaders@point-vertex-id divisor,Crash shaders@point-vertex-id gl_instanceid,Crash shaders@point-vertex-id gl_instanceid divisor,Crash diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt index 5e18c23e6c7..caba052c22f 100644 --- a/src/freedreno/ci/freedreno-a530-fails.txt +++ b/src/freedreno/ci/freedreno-a530-fails.txt @@ -79,7 +79,6 @@ glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail glx@glx_arb_sync_control@waitformsc,Fail diff --git a/src/freedreno/ci/freedreno-a618-fails.txt b/src/freedreno/ci/freedreno-a618-fails.txt index 95c908dabfc..f0fed0db97e 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -15,7 +15,6 @@ KHR-GL46.texture_cube_map_array.color_depth_attachments,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail # "../src/freedreno/ir3/ir3_shader.h:968:ir3_link_add: Assertion `i < ARRAY_SIZE(l->var)' failed." shaders@glsl-max-varyings >max_varying_components,Crash diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 8e14a83f89e..0a287abe16d 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -18,7 +18,6 @@ dEQP-GLES31.functional.texture.border_clamp.range_clamp.linear_float_color,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx-make-current,Fail glx@glx-multi-window-single-context,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv index 1b32808eae9..ff196d2b11f 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv @@ -7,7 +7,6 @@ glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_no_config_context@no fbconfig,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv index 60e88882931..88007cdb727 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv @@ -6,7 +6,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-swap-event_interval,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail glx@glx_ext_import_context@get current display,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv index 2d15c1498f5..999da02ed54 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-gfx1100-fail.csv @@ -6,7 +6,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-swap-event_interval,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_no_config_context@no fbconfig,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv index 6da527b22d1..99f7bbdb183 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv @@ -2,7 +2,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-swap-event_interval,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail glx@glx_ext_import_context@get current display,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv index 9a51c8d2c19..fa0ce438361 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv @@ -6,7 +6,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-swap-event_interval,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail glx@glx_ext_import_context@get current display,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv index aa810cf19cb..3f371130d88 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv @@ -5,7 +5,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-swap-event_interval,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_no_config_context@no fbconfig,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.1@line-smooth-stipple,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv index 9a61e23fb72..6f995d93ea4 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv @@ -5,7 +5,6 @@ glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail glx@glx_ext_import_context@get current display,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv index cbc9b273784..13de1544c5a 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv @@ -9,7 +9,6 @@ glx@glx-visuals-depth -pixmap,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,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail glx@glx_ext_import_context@get current display,Fail diff --git a/src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt index 83a41c197e0..9b0facea616 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt @@ -79,7 +79,6 @@ KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment_texture_2d_multisample_r glx@glx-multi-window-single-context,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_arb_sync_control@swapbuffersmsc-divisor-zero,Fail glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 0,Fail glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 1,Fail diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt index 75a77b8ce06..911321e9f20 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -21,7 +21,6 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx-swap-pixmap-bad,Fail diff --git a/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt b/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt index 5213e153513..4ab105111b0 100644 --- a/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt @@ -38,7 +38,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-multithread-texture,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_no_config_context@no fbconfig,Fail spec@arb_texture_rectangle@fbo-blit rect,Fail spec@egl_chromium_sync_control@conformance,Fail diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index 6f2565732a6..3b773dc0c85 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -482,7 +482,7 @@ dri_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, dca->reset = __DRI_CTX_RESET_LOSE_CONTEXT; break; default: - return BadValue; + return BadMatch; } break; case GLX_CONTEXT_RELEASE_BEHAVIOR_ARB: diff --git a/src/intel/ci/iris-kbl-fails.txt b/src/intel/ci/iris-kbl-fails.txt index a748be24f99..6b9f2227440 100644 --- a/src/intel/ci/iris-kbl-fails.txt +++ b/src/intel/ci/iris-kbl-fails.txt @@ -16,9 +16,6 @@ glx@glx-visuals-stencil -pixmap,Crash # X error 167 (GLXBadFBConfig (9)) was generated, but X error 8 was expected. glx@glx_arb_create_context_no_error@no error,Fail -# "X error 2 (non-GLX error (-1)) was generated, but X error 8 was expected." -glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail - # X error 167 (GLXBadFBConfig (9)) was generated, but GLXBadProfileARB (13) was expected. # Version = 1.2 # X error 167 (GLXBadFBConfig (9)) was generated, but GLXBadProfileARB (13) was expected.