AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: fix glx-create-context-invalid-es-version

Browse Source 
* GLES3.x is only valid for x <= 2
* The expected error is GLXBadProfileARB, not BadValue

cc: mesa-stable

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33036>
This commit is contained in:
Pierre-Eric Pelloux-Prayer
2025-01-10 16:14:06 +01:00
committed by Marge Bot
parent e536ed0824
commit b307951648
31 changed files with 2 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/ci/radeonsi-raven-fails.txt
-1
View File
@@ -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
src/amd/ci/radeonsi-stoney-fails.txt
-1
View File
@@ -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
src/broadcom/ci/broadcom-rpi3-fails.txt
-1
View File
@@ -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.
src/broadcom/ci/broadcom-rpi4-fails.txt
-1
View File
@@ -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
src/broadcom/ci/broadcom-rpi5-fails.txt
-1
View File
@@ -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
src/freedreno/ci/freedreno-a307-fails.txt
-1
View File
@@ -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
src/freedreno/ci/freedreno-a420-fails.txt
-1
View File
@@ -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
src/freedreno/ci/freedreno-a530-fails.txt
-1
View File
@@ -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
src/freedreno/ci/freedreno-a618-fails.txt
-1
View File
@@ -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
src/freedreno/ci/freedreno-a630-fails.txt
-1
View File
@@ -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
src/gallium/drivers/llvmpipe/ci/llvmpipe-fails.txt
-1
View File
@@ -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
src/gallium/drivers/radeonsi/ci/gfx10-navi10-fail.csv
-1
View File
@@ -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
1 # LLVM 18.1.2
5 glx@glx-visuals-depth -pixmap,Crash
6 glx@glx-visuals-stencil -pixmap,Crash
7 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_no_error@no error,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
src/gallium/drivers/radeonsi/ci/gfx10_3-navi21-fail.csv
-1
View File
@@ -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
1 # piglit failures
5 glx@glx-make-current,Fail
6 glx@glx-multi-window-single-context,Fail
7 glx@glx-swap-event_interval,Fail
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_ext_no_config_context@no fbconfig,Fail
10 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
src/gallium/drivers/radeonsi/ci/gfx11-navi31-fail.csv
-1
View File
@@ -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
1 # LLVM 20-dev (da439d3af47b)
6 glx@glx-multi-window-single-context,Fail
7 glx@glx-swap-event_interval,Fail
8 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_no_error@no error,Fail
9 glx@glx_ext_no_config_context@no fbconfig,Fail
10 glx@glx-visuals-depth -pixmap,Crash
11 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
src/gallium/drivers/radeonsi/ci/gfx6-tahiti-fail.csv
-1
View File
@@ -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
1 glx@glx_arb_create_context_es2_profile@invalid opengl es version glx@glx_arb_create_context_no_error@no error Fail
glx@glx_arb_create_context_es2_profile@invalid opengl es version Fail
1 glx@glx_arb_create_context_no_error@no error glx@glx_arb_create_context_no_error@no error Fail
2 glx@glx_ext_no_config_context@no fbconfig glx@glx_ext_no_config_context@no fbconfig Fail
3 glx@glx-multi-window-single-context glx@glx-multi-window-single-context Fail
src/gallium/drivers/radeonsi/ci/gfx7-hawaii-fail.csv
-1
View File
@@ -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
1 # piglit failures
4 glx@glx-multithread-texture,Fail
5 glx@glx-multi-window-single-context,Fail
6 glx@glx-swap-event_interval,Fail
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_ext_import_context@free context,Fail
9 glx@glx_ext_import_context@get context id,Fail
src/gallium/drivers/radeonsi/ci/gfx8-polaris11-fail.csv
-1
View File
@@ -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
1 # piglit failures
3 glx@glx-multithread-texture,Fail
4 glx@glx-multi-window-single-context,Fail
5 glx@glx-swap-event_interval,Fail
glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
6 glx@glx_arb_create_context_no_error@no error,Fail
7 glx@glx_ext_no_config_context@no fbconfig,Fail
8 spec@!opengl 1.0@gl-1.0-user-clip-all-planes,Fail
src/gallium/drivers/radeonsi/ci/gfx9-raven-fail.csv
-1
View File
@@ -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
1 # piglit failures
3 glx@glx-multi-window-single-context,Fail
4 glx@glx-visuals-depth -pixmap,Crash
5 glx@glx-visuals-stencil -pixmap,Crash
glx@glx_arb_create_context_es2_profile@invalid opengl es version,Fail
6 glx@glx_arb_create_context_no_error@no error,Fail
7 glx@glx_ext_import_context@free context,Fail
8 glx@glx_ext_import_context@get context id,Fail
src/gallium/drivers/radeonsi/ci/gfx9-vega20-fail.csv
-1
View File
@@ -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
1 # piglit failures
7 glx@glx-visuals-depth -pixmap,Fail
8 glx@glx-visuals-stencil -pixmap,Fail
9 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_no_error@no error,Fail
10 glx@glx_ext_import_context@free context,Fail
11 glx@glx_ext_import_context@get context id,Fail
12 glx@glx_ext_import_context@get current display,Fail
src/gallium/drivers/softpipe/ci/softpipe-fails.txt
-1
View File
@@ -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
src/gallium/drivers/svga/ci/svga-fails.txt
-1
View File
@@ -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
src/gallium/drivers/virgl/ci/virpipe-gl-fails.txt
-1
View File
@@ -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
src/gallium/drivers/zink/ci/zink-anv-adl-fails.txt
-1
View File
@@ -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
src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
-1
View File
@@ -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
src/gallium/drivers/zink/ci/zink-lvp-fails.txt
-1
View File
@@ -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
src/gallium/drivers/zink/ci/zink-tu-a750-fails.txt
-1
View File
@@ -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
src/gallium/drivers/zink/ci/zink-venus-lvp-fails.txt
-1
View File
@@ -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
src/glx/dri_common.c
+2 -2
View File
@@ -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:
src/intel/ci/iris-kbl-fails.txt
-1
View File
@@ -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
src/panfrost/ci/panfrost-g52-fails.txt
-1
View File
@@ -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
src/panfrost/ci/panfrost-g57-fails.txt
-1
View File
@@ -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