diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index a73fb13fd0f..0a8edaeb190 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -102,7 +102,6 @@ spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Fail spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj(bias) 3d,Fail spec@khr_texture_compression_astc@basic-gl,Fail -glx@glx-make-current,Crash glx@glx-multithread-buffer,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Fail diff --git a/src/broadcom/ci/broadcom-rpi3-flakes.txt b/src/broadcom/ci/broadcom-rpi3-flakes.txt index bfb660b52f4..caf706ea022 100644 --- a/src/broadcom/ci/broadcom-rpi3-flakes.txt +++ b/src/broadcom/ci/broadcom-rpi3-flakes.txt @@ -5,7 +5,6 @@ dEQP-GLES2.functional.clipping.triangle_vertex.clip_three.clip_pos_x_and_neg_x_n dEQP-GLES2.functional.draw.random.51 dEQP-GLES2.functional.texture.size.cube.256x256_rgb888 -glx@glx-multi-window-single-context shaders@glsl-vs-loop shaders@glsl-vs-loop-nested spec@arb_framebuffer_srgb@blit renderbuffer srgb single_sampled enabled clear diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index f5d0d54eb84..fb623584ba2 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -1,5 +1,3 @@ -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-multithread-buffer,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash diff --git a/src/freedreno/ci/freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt index 90218ee89ef..4e957b749bd 100644 --- a/src/freedreno/ci/freedreno-a307-fails.txt +++ b/src/freedreno/ci/freedreno-a307-fails.txt @@ -156,8 +156,6 @@ spec@glsl-1.30@execution@interpolation@interpolation-noperspective-gl_frontsecon spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-flat-fixed,Fail spec@glsl-1.30@execution@interpolation@interpolation-noperspective-other-smooth-fixed,Fail -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash diff --git a/src/freedreno/ci/freedreno-a420-fails.txt b/src/freedreno/ci/freedreno-a420-fails.txt index 7a9e26daf5e..3d5169297c4 100644 --- a/src/freedreno/ci/freedreno-a420-fails.txt +++ b/src/freedreno/ci/freedreno-a420-fails.txt @@ -291,8 +291,6 @@ spec@!opengl 2.1@polygon-stipple-fs,Fail spec@ext_packed_float@query-rgba-signed-components,Fail # Uncategorized piglit failures -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-query-drawable-glx_fbconfig_id-window,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt index 2e02d92b990..5be444966b5 100644 --- a/src/freedreno/ci/freedreno-a530-fails.txt +++ b/src/freedreno/ci/freedreno-a530-fails.txt @@ -596,8 +596,6 @@ KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_mirrored_repeat,Fail KHR-GLES3.texture_repeat_mode.rgba32ui_49x23_2_repeat,Fail glx@glx-multithread-buffer,Fail -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-tfp,Fail glx@glx-visuals-depth -pixmap,Crash diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index a5344d0b9db..d21fdb48fa2 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -47,8 +47,6 @@ glx@glx_ext_import_context@imported context has same context id,Fail glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt index d165affe0ef..db891e55930 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt @@ -29,13 +29,6 @@ spec@oes_shader_io_blocks@compiler@layout-location-aliasing.vert,Fail glx@glx-copy-sub-buffer,Fail glx@glx-copy-sub-buffer samples=2,Fail glx@glx-copy-sub-buffer samples=4,Fail - -# X Error of failed request: BadMatch (invalid parameter attributes) -# Major opcode of failed request: 150 (GLX) -# Minor opcode of failed request: 11 (X_GLXSwapBuffers) -glx@glx-make-current,Crash - -glx@glx-multi-window-single-context,Fail glx@glx-swap-copy,Fail glx@glx-swap-pixmap-bad,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv index d76031c1f7f..d8b584f04f8 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv @@ -1,6 +1,4 @@ # piglit failures -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash glx@glx_arb_create_context_es2_profile@invalid opengl es version,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 95bebb9e3ea..baf0e1b4453 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv @@ -1,6 +1,4 @@ # piglit failures -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-swap-event_interval,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash diff --git a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv index f9cc7a9d444..e9a7648e9b9 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv @@ -1,6 +1,4 @@ # piglit failures -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-swap-event_interval,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv index 1f52c4ca20e..a1f41ba3929 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv @@ -1,6 +1,4 @@ # piglit failures -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv index b8048c8931e..7d5fb828da4 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv @@ -5,8 +5,6 @@ spec@!opengl 1.1@windowoverlap,Fail spec@arb_shader_clock@execution@clock,Fail spec@egl_chromium_sync_control@conformance,Fail spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_msc_and_sbc_test,Fail -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-visuals-depth -pixmap,Fail glx@glx-visuals-stencil -pixmap,Fail glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail diff --git a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt index 95257ca3113..258b5c5601b 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt @@ -908,14 +908,8 @@ KHR-GLES31.core.texture_storage_multisample.GLCoverage.gl_tex_parameter_handlers fast_color_clear@fcc-front-buffer-distraction,Fail -# X Error of failed request: BadMatch (invalid parameter attributes) -# Major opcode of failed request: 150 (GLX) -# Minor opcode of failed request: 11 (X_GLXSwapBuffers) -glx@glx-make-current,Crash - glx@glx-multi-context-front,Fail -glx@glx-multi-window-single-context,Fail glx@glx-swap-copy,Fail glx@glx-swap-pixmap-bad,Fail diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index e3732a59883..78d50b466aa 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -72,8 +72,6 @@ KHR-GL43.transform_feedback_overflow_query_ARB.basic-single-stream-separate-attr KHR-GL43.transform_feedback_overflow_query_ARB.multiple-streams-multiple-buffers-per-stream,Fail KHR-GL43.transform_feedback_overflow_query_ARB.multiple-streams-one-buffer-per-stream,Fail -glx@glx-make-current,Crash -glx@glx-multi-window-single-context,Fail glx@glx-multithread-clearbuffer,Crash glx@glx-multithread-texture,Crash glx@glx-swap-copy,Fail diff --git a/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt b/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt index d47d2f3ba1b..21d8420a746 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-flakes.txt @@ -1,6 +1,5 @@ dEQP-GLES2.functional.texture.filtering.cube.nearest_linear_mirror_l8_pot spec@khr_debug@push-pop-group_gl.* -glx@glx-multi-window-single-context # "Pending expose event- rerunning." # exit status: signal: 11" diff --git a/src/gallium/drivers/zink/ci/zink-lvp-skips.txt b/src/gallium/drivers/zink/ci/zink-lvp-skips.txt index e6aa12bc0c0..3d10830dea1 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-skips.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-skips.txt @@ -6,7 +6,6 @@ KHR-GL32.texture_size_promotion.functional # ignores copied from the old runner script spec@arb_map_buffer_alignment@arb_map_buffer_alignment-map-invalidate-range -glx@glx-make-current spec@arb_timer_query.* spec@arb_sample_shading@builtin-gl-sample-mask spec@glsl-1.30@execution@tex-miplevel-selection.* diff --git a/src/gallium/drivers/zink/ci/zink-radv-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-fails.txt index 62c4b383a6b..d4d0fbad54f 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-fails.txt @@ -7,7 +7,6 @@ dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.sampler2dsh dEQP-GLES3.functional.shaders.texture_functions.textureprojoffset.sampler2dshadow_vertex,Fail # kopper -glx@glx-multi-window-single-context,Crash spec@ext_image_dma_buf_import@ext_image_dma_buf_import-export-tex,Crash spec@egl_chromium_sync_control@conformance@eglGetSyncValuesCHROMIUM_ust_test,Fail @@ -36,7 +35,6 @@ glx@glx_ext_import_context@imported context has same context id,Fail glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail -glx@glx-make-current,Crash glx@glx-swap-copy,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth,Crash diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index 632506dabbd..16f1613013e 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -417,7 +417,14 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable) (*pdraw->destroyDrawable) (pdraw); return NULL; } - pdraw->refcount = 1; + /* This sure does look suspicious, doesn't it? We're on this path because + * this is a naked Window. GLX 1.3 drawables have an explicit creation + * step (setting refcount to 1), and those we would have found in the + * hash lookup above, bumped their refcount for the bind_context we're + * being called for, and then returned. But since we just created the + * internal naked-Window state, we need to account for both here. + */ + pdraw->refcount = 2; return pdraw; } diff --git a/src/intel/ci/iris-kbl-fails.txt b/src/intel/ci/iris-kbl-fails.txt index adbaf54618a..7b83e9e70ae 100644 --- a/src/intel/ci/iris-kbl-fails.txt +++ b/src/intel/ci/iris-kbl-fails.txt @@ -13,15 +13,6 @@ dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x5,Fail dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x6,Fail dEQP-GLES3.functional.texture.compressed.astc.void_extent_ldr.8x8,Fail -# X Error of failed request: BadMatch (invalid parameter attributes) -# Major opcode of failed request: 151 (GLX) -# Minor opcode of failed request: 11 (X_GLXSwapBuffers) -# Serial number of failed request: 79 -# Current serial number in output stream: 80 -glx@glx-make-current,Crash - -glx@glx-multi-window-single-context,Fail - glx@glx-swap-pixmap-bad,Fail # failed to create drawable diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index bfdec49b210..e23ae08030f 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -10,9 +10,7 @@ glx@glx_ext_import_context@imported context has same context id,Fail glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail -glx@glx-make-current,Crash glx@glx-multithread-clearbuffer,Crash -glx@glx-multi-window-single-context,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash