diff --git a/src/amd/ci/radeonsi-raven-fails.txt b/src/amd/ci/radeonsi-raven-fails.txt index 0ea9112f6f8..6ecaeee196e 100644 --- a/src/amd/ci/radeonsi-raven-fails.txt +++ b/src/amd/ci/radeonsi-raven-fails.txt @@ -2,7 +2,6 @@ glx@glx-make-current,Fail glx@glx-multi-window-single-context,Fail 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 spec@!opengl 1.0@rasterpos,Fail spec@!opengl 1.0@rasterpos@glsl_vs_gs_linked,Fail diff --git a/src/amd/ci/radeonsi-stoney-fails.txt b/src/amd/ci/radeonsi-stoney-fails.txt index e9e5238e19c..7ccd392ae13 100644 --- a/src/amd/ci/radeonsi-stoney-fails.txt +++ b/src/amd/ci/radeonsi-stoney-fails.txt @@ -1,6 +1,5 @@ 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 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail spec@!opengl 1.0@rasterpos,Fail diff --git a/src/broadcom/ci/broadcom-rpi3-fails.txt b/src/broadcom/ci/broadcom-rpi3-fails.txt index e976ca30225..386f9e218da 100644 --- a/src/broadcom/ci/broadcom-rpi3-fails.txt +++ b/src/broadcom/ci/broadcom-rpi3-fails.txt @@ -97,7 +97,6 @@ spec@khr_texture_compression_astc@basic-gl,Fail glx@glx-make-current,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 # piglit: error: Test timed out. diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index ec13c32fbf5..bb887df488b 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -2,7 +2,6 @@ glx@glx-make-current,Fail glx@glx-multi-window-single-context,Fail glx@glx-swap-pixmap-bad,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 shaders@point-vertex-id divisor,Fail shaders@point-vertex-id gl_instanceid divisor,Fail diff --git a/src/broadcom/ci/broadcom-rpi5-fails.txt b/src/broadcom/ci/broadcom-rpi5-fails.txt index f3c8ef7eeaa..5fde1d76e33 100644 --- a/src/broadcom/ci/broadcom-rpi5-fails.txt +++ b/src/broadcom/ci/broadcom-rpi5-fails.txt @@ -3,7 +3,6 @@ glx@glx-multi-window-single-context,Fail glx@glx-swap-pixmap-bad,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 glx@glx_arb_create_context_no_error@no error,Fail glx@glx_arb_sync_control@waitformsc,Fail shaders@point-vertex-id divisor,Fail diff --git a/src/freedreno/ci/freedreno-a307-fails.txt b/src/freedreno/ci/freedreno-a307-fails.txt index 0b006f7243c..51693a0cfbc 100644 --- a/src/freedreno/ci/freedreno-a307-fails.txt +++ b/src/freedreno/ci/freedreno-a307-fails.txt @@ -153,7 +153,6 @@ 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 -glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail shaders@point-vertex-id divisor,Crash shaders@point-vertex-id gl_instanceid,Crash diff --git a/src/freedreno/ci/freedreno-a420-fails.txt b/src/freedreno/ci/freedreno-a420-fails.txt index 394e05ca114..909b1005650 100644 --- a/src/freedreno/ci/freedreno-a420-fails.txt +++ b/src/freedreno/ci/freedreno-a420-fails.txt @@ -286,7 +286,6 @@ glx@glx-query-drawable-glx_fbconfig_id-window,Fail glx@glx-swap-pixmap-bad,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 glx@glx_arb_create_context_no_error@no error,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail diff --git a/src/freedreno/ci/freedreno-a530-fails.txt b/src/freedreno/ci/freedreno-a530-fails.txt index bfd63570fdc..3868dc65691 100644 --- a/src/freedreno/ci/freedreno-a530-fails.txt +++ b/src/freedreno/ci/freedreno-a530-fails.txt @@ -77,7 +77,6 @@ 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 -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_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 948d253fcb7..de0b7132671 100644 --- a/src/freedreno/ci/freedreno-a618-fails.txt +++ b/src/freedreno/ci/freedreno-a618-fails.txt @@ -13,7 +13,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 spec@arb_depth_buffer_float@fbo-generatemipmap-formats,Fail diff --git a/src/freedreno/ci/freedreno-a630-fails.txt b/src/freedreno/ci/freedreno-a630-fails.txt index 4783c0a550d..64ff8ba419c 100644 --- a/src/freedreno/ci/freedreno-a630-fails.txt +++ b/src/freedreno/ci/freedreno-a630-fails.txt @@ -16,7 +16,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-make-current,Fail glx@glx-multi-window-single-context,Fail diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt index 0ca9a825b29..7591e8c825a 100644 --- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt +++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt @@ -27,7 +27,6 @@ glx@glx-visuals-stencil,Crash glx@glx-visuals-stencil -pixmap,Crash 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,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv index 052f73e56e5..19c03d8ff25 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv @@ -5,7 +5,6 @@ glx@glx-make-current,Fail 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 glx@glx_arb_create_context_no_error@no error,Fail glx@glx_ext_no_config_context@no fbconfig,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,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 1e0196a5507..4adb262100c 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv @@ -5,7 +5,6 @@ glx@glx-visuals-stencil -pixmap,Crash glx@glx-make-current,Fail 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_ext_no_config_context@no fbconfig,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv index 424cd4e8aa3..d8bbac3bd89 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv @@ -6,7 +6,6 @@ glx@glx_arb_sync_control@timing -divisor 2,Fail glx@glx-make-current,Fail 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_ext_no_config_context@no fbconfig,Fail glx@glx-visuals-depth -pixmap,Crash diff --git a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv index f316bb3668a..c7ed499eac9 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv @@ -1,4 +1,3 @@ -glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail glx@glx_arb_create_context_no_error@no error,Fail glx@glx_ext_no_config_context@no fbconfig,Fail glx@glx-multi-window-single-context,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv index 1db2a97380d..80282446cc6 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv @@ -4,7 +4,6 @@ glx@glx-multithread-makecurrent-1,Fail glx@glx-multithread-texture,Fail 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_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv index 5391a45b3b4..17fb5938133 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv @@ -3,7 +3,6 @@ glx@glx-make-current,Fail glx@glx-multithread-texture,Fail 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_ext_no_config_context@no fbconfig,Fail spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv index 86adb5b3a04..1cd5a3c09d6 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv @@ -3,7 +3,6 @@ glx@glx-make-current,Fail 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 glx@glx_arb_create_context_no_error@no error,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail diff --git a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv index eaea48fe595..9ed81f7bd3a 100644 --- a/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv +++ b/src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv @@ -7,7 +7,6 @@ glx@glx-make-current,Fail 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 glx@glx_arb_create_context_no_error@no error,Fail glx@glx_ext_import_context@free context,Fail glx@glx_ext_import_context@get context id,Fail diff --git a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt index 916755e0205..10dbf8a72f9 100644 --- a/src/gallium/drivers/softpipe/ci/softpipe-fails.txt +++ b/src/gallium/drivers/softpipe/ci/softpipe-fails.txt @@ -865,7 +865,6 @@ glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil,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_ext_import_context@free context,Fail diff --git a/src/gallium/drivers/svga/ci/svga-fails.txt b/src/gallium/drivers/svga/ci/svga-fails.txt index d1aed13b0c0..046b360caa4 100644 --- a/src/gallium/drivers/svga/ci/svga-fails.txt +++ b/src/gallium/drivers/svga/ci/svga-fails.txt @@ -4,7 +4,6 @@ glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth,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 glx@glx_arb_create_context_no_error@no error,Fail glx@glx_arb_sync_control@waitformsc,Fail shaders@glsl-max-varyings >max_varying_components,Fail diff --git a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt index ba25928245c..d9d5964143a 100644 --- a/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt +++ b/src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt @@ -58,7 +58,6 @@ glx@glx-visuals-depth,Crash glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil,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 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 0cde7efe91a..aeb1f2bcc16 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt @@ -76,7 +76,6 @@ KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment_texture_2d_multisample_r KHR-GL46.sparse_texture2_tests.SparseTexture2Commitment_texture_2d_multisample_rgb10_a2,Fail 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_sync_control@swapbuffersmsc-divisor-zero,Fail glx@glx_arb_sync_control@swapbuffersmsc-return swap_interval 0,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 8102f33dc07..eb5fd656f90 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -19,7 +19,6 @@ spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvu420,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-sample_yvyu,Fail spec@ext_image_dma_buf_import@ext_image_dma_buf_import-transcode-nv12-as-r8-gr88,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-swap-pixmap-bad,Fail diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt index 0f49c948ae0..b48bccc9d76 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt @@ -12,7 +12,6 @@ glx@glx_arb_create_context@invalid flag,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth,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_ext_import_context@free context,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 88faf2d6c6d..9e0420a6c52 100644 --- a/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt @@ -36,7 +36,6 @@ dEQP-GLES3.functional.shaders.matrix.inverse.dynamic.mediump_mat4_float_vertex,F 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_ext_no_config_context@no fbconfig,Fail spec@arb_texture_rectangle@fbo-blit rect,Fail diff --git a/src/gallium/drivers/zink/ci/zink-venus-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-venus-lvp-fails.txt index e2e7374fb32..cb6616484d6 100644 --- a/src/gallium/drivers/zink/ci/zink-venus-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-venus-lvp-fails.txt @@ -21,7 +21,6 @@ glx@glx_arb_create_context@invalid flag,Fail glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth,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_ext_import_context@free context,Fail diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index 3b773dc0c85..b275eaf9680 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -524,14 +524,14 @@ dri_convert_glx_attribs(unsigned num_attribs, const uint32_t *attribs, dca->api = __DRI_API_OPENGL; break; case GLX_CONTEXT_ES_PROFILE_BIT_EXT: - if (dca->major_ver >= 3) + if (dca->major_ver == 3 && dca->minor_ver <= 2) dca->api = __DRI_API_GLES3; else if (dca->major_ver == 2 && dca->minor_ver == 0) dca->api = __DRI_API_GLES2; else if (dca->major_ver == 1 && dca->minor_ver < 2) dca->api = __DRI_API_GLES; else { - return BadValue; + return GLXBadProfileARB; } break; default: diff --git a/src/intel/ci/iris-kbl-fails.txt b/src/intel/ci/iris-kbl-fails.txt index fa39cd76f57..ce5a94301a7 100644 --- a/src/intel/ci/iris-kbl-fails.txt +++ b/src/intel/ci/iris-kbl-fails.txt @@ -22,7 +22,6 @@ glx@glx_arb_create_context_no_error@no error,Fail # Version = 2.1 # X error 167 (GLXBadFBConfig (9)) was generated, but GLXBadProfileARB (13) was expected. # Version = 3.3 -glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail spec@!opengl 1.0@rasterpos,Fail diff --git a/src/panfrost/ci/panfrost-g52-fails.txt b/src/panfrost/ci/panfrost-g52-fails.txt index 8837c09ba3c..c9e2a1caf67 100644 --- a/src/panfrost/ci/panfrost-g52-fails.txt +++ b/src/panfrost/ci/panfrost-g52-fails.txt @@ -1,4 +1,3 @@ -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_sync_control@swapbuffersmsc-divisor-zero,Fail glx@glx-make-current,Fail diff --git a/src/panfrost/ci/panfrost-g57-fails.txt b/src/panfrost/ci/panfrost-g57-fails.txt index 0e2f030ab32..41b1596f1ad 100644 --- a/src/panfrost/ci/panfrost-g57-fails.txt +++ b/src/panfrost/ci/panfrost-g57-fails.txt @@ -1,4 +1,3 @@ -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_sync_control@swapbuffersmsc-divisor-zero,Fail glx@glx_ext_import_context@free context,Fail