llvmpipe: enable GL compatibility profiles

The two rasterpos fails looks related to GLSL linking, the vertex
shader is linked with the geometry shader which doesn't use any
of it's outputs so they seem to get removed, which stops the rasterpos
from working.

Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12374>

diff --git a/docs/relnotes/new_features.txt b/docs/relnotes/new_features.txt
index ea51716..ac5d90f 100644 (file)
--- a/docs/relnotes/new_features.txt
+++ b/docs/relnotes/new_features.txt
@@ -5,3 +5,4 @@ VK_EXT_shader_atomic_float2 on Intel and RADV.
 VK_KHR_timeline_semaphore on lavapipe
 VK_EXT_external_memory_host on lavapipe
 GL_AMD_pinned_memory on llvmpipe
+GL 4.5 compatibility on llvmpipe

diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-glslparser.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-glslparser.txt
index bab460a..795b0cf 100644 (file)
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-glslparser.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-glslparser.txt
@@ -180,35 +180,38 @@ spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.geom: skip
 spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.tesc: skip
 spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_shader_trinary_minmax/preprocessor/disabled-undefined-core.vert: skip
+spec/amd_vertex_shader_layer/preprocessor/disabled-defined-compat.frag: skip
+spec/amd_vertex_shader_layer/preprocessor/disabled-defined-compat.vert: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-defined-core.comp: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-defined-core.frag: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-defined-core.geom: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-defined-core.tesc: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-defined-core.tese: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-defined-core.vert: skip
+spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-compat.frag: skip
+spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-compat.vert: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.comp: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.frag: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.geom: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.tesc: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_vertex_shader_layer/preprocessor/disabled-undefined-core.vert: skip
-spec/amd_vertex_shader_layer/preprocessor/enabled-compat.frag: skip
-spec/amd_vertex_shader_layer/preprocessor/enabled-compat.vert: skip
-spec/amd_vertex_shader_viewport_index/compiler/vs-redeclares-pervertex-out-viewport-index-compat.vert: skip
+spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-compat.frag: skip
+spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-compat.vert: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.comp: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.frag: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.geom: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.tesc: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.tese: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-defined-core.vert: skip
+spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-compat.frag: skip
+spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-compat.vert: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.comp: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.frag: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.geom: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.tesc: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.tese: skip
 spec/amd_vertex_shader_viewport_index/preprocessor/disabled-undefined-core.vert: skip
-spec/amd_vertex_shader_viewport_index/preprocessor/enabled-compat.frag: skip
-spec/amd_vertex_shader_viewport_index/preprocessor/enabled-compat.vert: skip
 spec/arb_arrays_of_arrays/preprocessor/disabled-defined-compat.frag: skip
 spec/arb_arrays_of_arrays/preprocessor/disabled-defined-compat.vert: skip
 spec/arb_arrays_of_arrays/preprocessor/disabled-defined-core.comp: skip
@@ -674,20 +677,22 @@ spec/arb_shader_image_size/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_image_size/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_image_size/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_image_size/preprocessor/disabled-undefined-core.vert: skip
+spec/arb_shader_precision/preprocessor/disabled-defined-compat.frag: skip
+spec/arb_shader_precision/preprocessor/disabled-defined-compat.vert: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.comp: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.frag: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.geom: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.tese: skip
 spec/arb_shader_precision/preprocessor/disabled-defined-core.vert: skip
+spec/arb_shader_precision/preprocessor/disabled-undefined-compat.frag: skip
+spec/arb_shader_precision/preprocessor/disabled-undefined-compat.vert: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.comp: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.frag: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_precision/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_precision/preprocessor/enabled-compat.frag: skip
-spec/arb_shader_precision/preprocessor/enabled-compat.vert: skip
 spec/arb_shader_stencil_export/preprocessor/disabled-defined-compat.frag: skip
 spec/arb_shader_stencil_export/preprocessor/disabled-defined-compat.vert: skip
 spec/arb_shader_stencil_export/preprocessor/disabled-defined-core.comp: skip
@@ -2138,171 +2143,6 @@ spec/ext_texture_buffer/preprocessor/disabled-undefined-es.tese: skip
 spec/ext_texture_buffer/preprocessor/disabled-undefined-es.vert: skip
 spec/ext_texture_shadow_lod/compiler/negative_compile.frag: skip
 spec/glsl-1.20/compiler/invalid-vec4-array-to-vec3-array-conversion.vert: fail
-spec/glsl-1.50/compiler/arb_compatibility-gs/ftransform.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_backcolor.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_backlightmodelproduct.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_backlightproduct.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_backmaterial.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_backsecondarycolor.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_clipplane.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_clipvertex.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_eyeplanes.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_fog.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_fogfragcoord.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_fogparameters.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_frontcolor.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_frontlightmodelproduct.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_frontlightproduct.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_frontmaterial.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_frontsecondarycolor.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_lightmodelparameters.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_lightmodelproducts.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_lightproducts.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_lightsource.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_lightsourceparameters.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_materialparameters.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_maxclipplanes.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_maxlights.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_maxtexturecoords.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_maxtextureunits.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_modelviewmatrix.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_normalmatrix.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_objectplanes.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_point.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_pointparameters.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_texcoord.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_textureenvcolor.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/gl_texturematrix.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_backcolor-in-gl_pervertex.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_backcolor.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_clipvertex-in-gl_pervertex.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_clipvertex.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_fogfragcoord-in-gl_pervertex.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_fogfragcoord.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_frontcolor-in-gl_pervertex.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_frontcolor.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_texcoord-in-gl_pervertex.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility-gs/redeclare-gl_texcoord.geom: skip
-spec/glsl-1.50/compiler/arb_compatibility/ftransform.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_backcolor.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_backlightmodelproduct.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_backlightproduct.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_backmaterial.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_backsecondarycolor.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_clipplane.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_clipvertex.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_color-fs.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_color-vs.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_eyeplanes.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_fog.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_fogcoord.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_fogfragcoord-fs.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_fogparameters.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_frontcolor.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_frontlightmodelproduct.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_frontlightproduct.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_frontmaterial.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_frontsecondarycolor.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_lightmodelparameters.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_lightmodelproducts.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_lightproducts.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_lightsource.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_lightsourceparameters.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_materialparameters.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_maxclipplanes.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_maxlights.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_maxtexturecoords.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_maxtextureunits.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_modelviewmatrix.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_multitexcoord0.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_normal.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_normalmatrix.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_objectplanes.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_point.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_pointparameters.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_secondarycolor.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_secondarycolor.vert: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_textureenvcolor.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_texturematrix.frag: skip
-spec/glsl-1.50/compiler/arb_compatibility/gl_vertex.vert: skip
-spec/glsl-1.50/compiler/compatibility-gs/ftransform.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_backcolor.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_backlightmodelproduct.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_backlightproduct.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_backmaterial.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_backsecondarycolor.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_clipplane.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_clipvertex.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_eyeplanes.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_fog.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_fogfragcoord.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_fogparameters.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_frontcolor.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_frontlightmodelproduct.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_frontlightproduct.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_frontmaterial.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_frontsecondarycolor.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_lightmodelparameters.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_lightmodelproducts.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_lightproducts.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_lightsource.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_lightsourceparameters.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_materialparameters.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_maxclipplanes.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_maxlights.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_maxtexturecoords.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_maxtextureunits.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_modelviewmatrix.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_normalmatrix.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_objectplanes.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_point.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_pointparameters.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_texcoord.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_textureenvcolor.geom: skip
-spec/glsl-1.50/compiler/compatibility-gs/gl_texturematrix.geom: skip
-spec/glsl-1.50/compiler/compatibility/ftransform.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_backcolor.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_backlightmodelproduct.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_backlightproduct.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_backmaterial.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_backsecondarycolor.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_clipplane.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_clipvertex.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_color-fs.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_color-vs.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_compatibility_profile.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_eyeplanes.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_fog.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_fogcoord.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_fogfragcoord-fs.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_fogparameters.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_frontcolor.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_frontlightmodelproduct.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_frontlightproduct.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_frontmaterial.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_frontsecondarycolor.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_lightmodelparameters.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_lightmodelproducts.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_lightproducts.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_lightsource.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_lightsourceparameters.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_materialparameters.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_maxclipplanes.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_maxlights.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_maxtexturecoords.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_maxtextureunits.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_modelviewmatrix.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_multitexcoord0.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_normal.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_normalmatrix.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_objectplanes.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_point.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_pointparameters.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_secondarycolor.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_secondarycolor.vert: skip
-spec/glsl-1.50/compiler/compatibility/gl_textureenvcolor.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_texturematrix.frag: skip
-spec/glsl-1.50/compiler/compatibility/gl_vertex.vert: skip
 spec/intel_conservative_rasterization/compiler/inner_coverage.gl.frag: skip
 spec/intel_conservative_rasterization/compiler/inner_coverage.gl.vert: skip
 spec/intel_conservative_rasterization/compiler/inner_coverage.gles.frag: skip

diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt
index eae5ffc..ba9c578 100644 (file)
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_gl.txt
@@ -1,4 +1,3 @@
-fast_color_clear/fcc-clear-tex: skip
 glx/glx-buffer-age: skip
 glx/glx-buffer-age vblank_mode=0: skip
 glx/glx-copy-sub-buffer: fail
@@ -79,8 +78,6 @@ shaders/activeprogram-bad-program: skip
 shaders/activeprogram-get: skip
 shaders/createshaderprogram-attached-shaders: skip
 shaders/createshaderprogram-bad-type: skip
-shaders/glsl-fs-fogscale/gs-out and fs: skip
-shaders/glsl-fs-fogscale/vs, gs and fs: skip
 shaders/sso-simple: skip
 shaders/sso-uniforms-01: skip
 shaders/sso-uniforms-02: skip
@@ -90,13 +87,8 @@ shaders/useshaderprogram-bad-program: skip
 shaders/useshaderprogram-bad-type: skip
 shaders/useshaderprogram-flushverts-1: skip
 spec/!opengl 1.0/gl-1.0-swapbuffers-behavior: fail
-spec/!opengl 1.0/rasterpos/glsl_vs_gs_linked: skip
-spec/!opengl 1.0/rasterpos/glsl_vs_gs_sso: skip
-spec/!opengl 1.0/rasterpos/glsl_vs_image1d: skip
-spec/!opengl 1.0/rasterpos/glsl_vs_image_bo: skip
-spec/!opengl 1.0/rasterpos/glsl_vs_ssbo: skip
-spec/!opengl 1.0/rasterpos/glsl_vs_tes_linked: skip
-spec/!opengl 1.0/rasterpos/glsl_vs_tes_sso: skip
+spec/!opengl 1.0/rasterpos/glsl_vs_gs_linked: fail
+spec/!opengl 1.0/rasterpos/glsl_vs_tes_linked: fail
 spec/!opengl 1.1/depthstencil-default_fb-blit samples=16: skip
 spec/!opengl 1.1/depthstencil-default_fb-blit samples=32: skip
 spec/!opengl 1.1/depthstencil-default_fb-blit samples=6: skip
@@ -203,166 +195,6 @@ spec/!opengl 1.4/copy-pixels samples=4: skip
 spec/!opengl 1.4/copy-pixels samples=6: skip
 spec/!opengl 1.4/copy-pixels samples=8: skip
 spec/!opengl 1.4/gl-1.4-rgba-mipmap-texture-with-rgb-visual: skip
-spec/!opengl 2.0/vertex-program-two-side back back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side back/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled back/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front back/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled front/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side enabled/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front back/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2 back2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2 back2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2 back2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2 back2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2 back2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front2/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side front/vs, tcs, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side/gs-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side/tcs-out, tes and fs: skip
-spec/!opengl 2.0/vertex-program-two-side/tes-out and fs: skip
-spec/!opengl 2.0/vertex-program-two-side/vs, gs and fs: skip
-spec/!opengl 2.0/vertex-program-two-side/vs, tcs, tes and fs: skip
 spec/!opengl 3.0/clearbuffer-depth-cs-probe: fail
 spec/!opengl 3.1/draw-buffers-errors: skip
 spec/!opengl 3.2/gl-3.2-adj-prims cull-back pv-first: fail
@@ -395,7 +227,6 @@ spec/arb_bindless_texture/legal: skip
 spec/arb_bindless_texture/limit: skip
 spec/arb_bindless_texture/uint64_attribs: skip
 spec/arb_bindless_texture/uniform: skip
-spec/arb_compute_shader/display-list: skip
 spec/arb_compute_variable_group_size/errors: skip
 spec/arb_compute_variable_group_size/local-size: skip
 spec/arb_compute_variable_group_size/minmax: skip
@@ -456,7 +287,6 @@ spec/arb_geometry_shader4/arb_geometry_shader4-program-parameter-vertices-out ma
 spec/arb_geometry_shader4/arb_geometry_shader4-program-parameter-vertices-out tf 1: skip
 spec/arb_geometry_shader4/arb_geometry_shader4-program-parameter-vertices-out tf max: skip
 spec/arb_geometry_shader4/arb_geometry_shader4-vertices-in: skip
-spec/arb_gpu_shader_fp64/execution/arb_gpu_shader_fp64-dlist-uniforms: skip
 spec/arb_internalformat_query/minmax: skip
 spec/arb_internalformat_query/misc. api error checks: skip
 spec/arb_pipeline_statistics_query/arb_pipeline_statistics_query-frag: fail
@@ -500,8 +330,6 @@ spec/arb_sample_shading/samplemask 6: skip
 spec/arb_sample_shading/samplemask 6 all: skip
 spec/arb_sample_shading/samplemask 8: skip
 spec/arb_sample_shading/samplemask 8 all: skip
-spec/arb_separate_shader_objects/programuniform coverage/double matrices: skip
-spec/arb_separate_shader_objects/programuniform coverage/double scalar and vectors: skip
 spec/arb_shader_atomic_counters/max-counters/combined test above maximum number of atomic counter buffers: skip
 spec/arb_shader_image_load_store/early-z/occlusion query test/early-z pass: fail
 spec/arb_shader_image_load_store/max-size/image2dmsarray max size test/4x16384x8x8: skip
@@ -644,7 +472,6 @@ spec/arb_sparse_buffer/basic: skip
 spec/arb_sparse_buffer/buffer-data: skip
 spec/arb_sparse_buffer/commit: skip
 spec/arb_sparse_buffer/minmax: skip
-spec/arb_tessellation_shader/arb_tessellation_shader-immediate-mode-draw-patches: skip
 spec/arb_texture_buffer_object/negative-unsupported: skip
 spec/arb_texture_cube_map/copyteximage cube samples=16: skip
 spec/arb_texture_cube_map/copyteximage cube samples=32: skip
@@ -758,10 +585,8 @@ spec/arb_texture_rg/multisample-formats 8 gl_arb_texture_rg-float: skip
 spec/arb_texture_rg/multisample-formats 8 gl_arb_texture_rg-int: skip
 spec/arb_texture_stencil8/fbo-clear-formats/gl_stencil_index8 (fbo incomplete): skip
 spec/arb_timer_query/query gl_timestamp: fail
-spec/arb_vertex_attrib_64bit/get_double_attribs-display-lists: skip
 spec/arb_vertex_program/vp-address-02: skip
 spec/arb_vertex_program/vp-address-04: skip
-spec/arb_viewport_array/display-list: skip
 spec/ati_envmap_bumpmap/ati_envmap_bumpmap-bump: skip
 spec/egl 1.4/egl-blob-cache: skip
 spec/egl 1.4/egl-context-priority: skip
@@ -1471,8 +1296,6 @@ spec/ext_window_rectangles/errors: skip
 spec/ext_window_rectangles/errors_gles3: skip
 spec/ext_window_rectangles/render: skip
 spec/ext_window_rectangles/render_gles3: skip
-spec/glsl-1.30/execution/tex-miplevel-selection textureoffset 2darrayshadow: skip
-spec/glsl-1.50/built-in constants compatibility: skip
 spec/intel_blackhole_render/intel_blackhole-blit: skip
 spec/intel_blackhole_render/intel_blackhole-blit_gles2: skip
 spec/intel_blackhole_render/intel_blackhole-blit_gles3: skip

diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
index 4df080e..4dace0d 100644 (file)
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
@@ -107,16 +107,7 @@ spec/arb_shader_ballot/execution/fs-readinvocation-uint-uniform: skip
 spec/arb_shader_clock/execution/clock: skip
 spec/arb_shader_clock/execution/clock2x32: skip
 spec/arb_shader_storage_buffer_object/execution/ssbo-atomiccompswap-int: fail
-spec/arb_shader_subroutine/execution/simple-subroutine-dlist: skip
-spec/arb_tessellation_shader/execution/compatibility/tcs-tes-ff-frag: skip
-spec/arb_tessellation_shader/execution/compatibility/tes-clamp-vertex-color: skip
-spec/arb_tessellation_shader/execution/compatibility/tes-clip-vertex-different-from-position: skip
-spec/arb_tessellation_shader/execution/compatibility/vs-tcs-tes-clip-vertex-different-from-position: skip
-spec/arb_tessellation_shader/execution/compatibility/vs-tcs-tes-clip-vertex-enables: skip
-spec/arb_tessellation_shader/execution/compatibility/vs-tcs-tes-gs-clip-vertex-different-from-position: skip
 spec/arb_tessellation_shader/execution/gs-primitiveid-instanced: fail
-spec/arb_tessellation_shader/execution/tcs-tes-vertex-dlist: skip
-spec/arb_tessellation_shader/execution/vs-tes-tessinner-tessouter-inputs-quads-dlist: skip
 spec/ext_demote_to_helper_invocation/execution/demote: skip
 spec/ext_demote_to_helper_invocation/execution/demote_with_derivatives: skip
 spec/ext_shader_framebuffer_fetch/execution/gl/1d: skip
@@ -157,31 +148,6 @@ spec/ext_shader_framebuffer_fetch_non_coherent/execution/gles3/simple-ms8: skip
 spec/ext_shader_image_load_formatted/execution/image_checkerboard: skip
 spec/glsl-1.10/preprocessor/extension-defined-test: skip
 spec/glsl-1.10/preprocessor/extension-if-1: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-accept: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-reject: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-different-from-position: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-enables: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-equal-to-position: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-homogeneity: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-primitives-lines: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-primitives-points: skip
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-primitives-triangle-strip: skip
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-const-accept: skip
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-const-reject: skip
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-different-from-position: skip
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-enables: skip
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-equal-to-position: skip
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-homogeneity: skip
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-primitives-triangle-strip: skip
-spec/glsl-1.50/execution/compatibility/gs-clamp-vertex-color: skip
-spec/glsl-1.50/execution/compatibility/gs-ff-frag: skip
-spec/glsl-1.50/execution/compatibility/gs-texcoord-array: skip
-spec/glsl-1.50/execution/compatibility/gs-texcoord-array-2: skip
-spec/glsl-1.50/execution/compatibility/vs-gs-ff-frag: skip
-spec/glsl-1.50/execution/compatibility/vs-gs-texcoord-array: skip
-spec/glsl-1.50/execution/compatibility/vs-gs-texcoord-array-2: skip
-spec/glsl-1.50/execution/primitive-id-no-gs-quad-strip: skip
-spec/glsl-1.50/execution/primitive-id-no-gs-quads: skip
 spec/glsl-4.00/execution/conversion/frag-conversion-explicit-dmat2-mat2: fail
 spec/glsl-4.00/execution/conversion/frag-conversion-explicit-dmat2x3-mat2x3: fail
 spec/glsl-4.00/execution/conversion/frag-conversion-explicit-dmat2x4-mat2x4: fail

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 811ad35..0d55bb0 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -209,12 +209,11 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_VERTEX_COLOR_UNCLAMPED:
    case PIPE_CAP_VERTEX_COLOR_CLAMPED:
       return 1;
+   case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
    case PIPE_CAP_GLSL_FEATURE_LEVEL: {
       struct llvmpipe_screen *lscreen = llvmpipe_screen(screen);
       return lscreen->use_tgsi ? 330 : 450;
    }
-   case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY:
-      return 140;
    case PIPE_CAP_COMPUTE:
       return GALLIVM_HAVE_CORO;
    case PIPE_CAP_USER_VERTEX_BUFFERS:

diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
index 00d5c8a..3ca3074 100644 (file)
--- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
@@ -2718,18 +2718,6 @@ spec/glsl-1.30/execution/tex-miplevel-selection textureprojgradoffset 2d: fail
 spec/glsl-1.30/execution/tex-miplevel-selection textureprojgradoffset 2d_projvec4: fail
 spec/glsl-1.30/execution/tex-miplevel-selection textureprojgradoffset 2dshadow: fail
 spec/glsl-1.30/execution/tex-miplevel-selection textureprojgradoffset 3d: fail
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-accept: fail
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-reject: fail
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-different-from-position: fail
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-homogeneity: fail
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-primitives-lines: fail
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-primitives-points: fail
-spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-primitives-triangle-strip: fail
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-const-accept: fail
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-const-reject: fail
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-different-from-position: fail
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-homogeneity: fail
-spec/glsl-1.50/execution/compatibility/clipping/vs-gs-clip-vertex-primitives-triangle-strip: fail
 spec/glsl-1.50/execution/compatibility/gs-clamp-vertex-color: fail
 spec/glsl-1.50/execution/geometry/clip-distance-bulk-copy: fail
 spec/glsl-1.50/execution/geometry/clip-distance-itemized-copy: fail
@@ -2738,8 +2726,8 @@ spec/glsl-1.50/execution/interface-vs-unnamed-to-fs-unnamed: fail
 spec/glsl-1.50/execution/primitive-id-no-gs: fail
 spec/glsl-1.50/execution/primitive-id-no-gs-first-vertex: fail
 spec/glsl-1.50/execution/primitive-id-no-gs-instanced: fail
-spec/glsl-1.50/execution/primitive-id-no-gs-quad-strip: crash
-spec/glsl-1.50/execution/primitive-id-no-gs-quads: crash
+spec/glsl-1.50/execution/primitive-id-no-gs-quad-strip: fail
+spec/glsl-1.50/execution/primitive-id-no-gs-quads: fail
 spec/glsl-1.50/execution/primitive-id-no-gs-strip: fail
 spec/glsl-1.50/execution/primitive-id-no-gs-strip-first-vertex: fail
 spec/glsl-1.50/execution/texturesize/tes-texturesize-isampler1d: skip