glx: return BadMatch for invalid reset notification strategy

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 <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32281>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2024-11-12 17:11:03 +01:00 committed by Marge Bot
parent d3798130ad
commit 9f4ab06842
19 changed files with 1 additions and 21 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

1 # LLVM 18.1.2
7 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
8 glx@glx_arb_create_context_no_error@no error,Fail
9 glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_no_config_context@no fbconfig,Fail
glx@glx_ext_no_config_context@no fbconfig,Fail
10 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
11 spec@!opengl 1.1@line-smooth-stipple,Fail
12 spec@arb_bindless_texture@compiler@samplers@arith-bound-sampler-texture2d.frag,Crash

View file

@ -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

1 # LLVM 18.0.0git
6 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
7 glx@glx_arb_create_context_no_error@no error,Fail
8 glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_import_context@free context,Fail
glx@glx_ext_import_context@free context,Fail
9 glx@glx_ext_import_context@get context id,Fail
10 glx@glx_ext_import_context@get current display,Fail
11 glx@glx_ext_import_context@import context- multi process,Fail

View file

@ -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

1 # LLVM 18.1.2
6 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
7 glx@glx_arb_create_context_no_error@no error,Fail
8 glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_no_config_context@no fbconfig,Fail
glx@glx_ext_no_config_context@no fbconfig,Fail
9 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
10 spec@!opengl 1.1@line-smooth-stipple,Fail
11 spec@arb_pipeline_statistics_query@arb_pipeline_statistics_query-frag,Fail

View file

@ -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

1 glx@glx-multi-window-single-context Fail
2 glx@glx-swap-event_interval Fail
3 glx@glx_arb_create_context_es2_profile@invalid opengl es version Fail
4 glx@glx_arb_create_context_no_error@no error Fail
glx@glx_arb_create_context_robustness@invalid reset notification strategy Fail
5 glx@glx_ext_import_context@free context Fail
6 glx@glx_ext_import_context@get context id Fail
7 glx@glx_ext_import_context@get current display Fail

View file

@ -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

1 # piglit failures
6 glx@glx-swap-event_interval,Fail
7 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
8 glx@glx_arb_create_context_no_error@no error,Fail
glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail
9 glx@glx_ext_import_context@free context,Fail
10 glx@glx_ext_import_context@get context id,Fail
11 glx@glx_ext_import_context@get current display,Fail

View file

@ -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

1 # piglit failures
5 glx@glx-swap-event_interval,Fail
6 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
7 glx@glx_arb_create_context_no_error@no error,Fail
glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail
8 glx@glx_ext_no_config_context@no fbconfig,Fail
9 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
10 spec@!opengl 1.1@line-smooth-stipple,Fail

View file

@ -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

1 # piglit failures
5 glx@glx-visuals-stencil -pixmap,Crash
6 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
7 glx@glx_arb_create_context_no_error@no error,Fail
glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail
8 glx@glx_ext_import_context@free context,Fail
9 glx@glx_ext_import_context@get context id,Fail
10 glx@glx_ext_import_context@get current display,Fail

View file

@ -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

1 # piglit failures
9 glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
10 glx@glx_arb_create_context_no_error@no error,Fail
11 glx@glx_arb_create_context_robustness@invalid reset notification strategy,Fail glx@glx_ext_import_context@free context,Fail
glx@glx_ext_import_context@free context,Fail
12 glx@glx_ext_import_context@get context id,Fail
13 glx@glx_ext_import_context@get current display,Fail
14 glx@glx_ext_import_context@import context- multi process,Fail

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -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.