llvmpipe: enable GL_ARB_shader_texture_image_samples

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4122>

4 files changed, 63 insertions, 37 deletions

diff --git a/.gitlab-ci/piglit/glslparser.txt b/.gitlab-ci/piglit/glslparser.txt
index f0b8f427f2c..de2eeda1559 100644
--- a/.gitlab-ci/piglit/glslparser.txt
+++ b/.gitlab-ci/piglit/glslparser.txt
@@ -1330,17 +1330,22 @@ spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.tese: skip
 spec/arb_shader_subroutine/preprocessor/disabled-undefined-core.vert: skip
-spec/arb_shader_texture_image_samples/compiler/fs-image-samples.frag: skip
-spec/arb_shader_texture_image_samples/compiler/fs-texture-samples.frag: skip
-spec/arb_shader_texture_image_samples/compiler/vs-texture-samples.vert: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-compat.frag: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-compat.vert: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-core.comp: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-core.frag: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-core.geom: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-core.tesc: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-core.tese: skip
-spec/arb_shader_texture_image_samples/preprocessor/enabled-core.vert: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-compat.frag: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-compat.vert: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.comp: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.frag: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.geom: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.tesc: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.tese: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-defined-core.vert: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-compat.frag: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-compat.vert: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.comp: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.frag: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.geom: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.tesc: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.tese: skip
+spec/arb_shader_texture_image_samples/preprocessor/disabled-undefined-core.vert: skip
 spec/arb_shader_texture_lod/preprocessor/disabled-defined-compat.frag: skip
 spec/arb_shader_texture_lod/preprocessor/disabled-defined-compat.vert: skip
 spec/arb_shader_texture_lod/preprocessor/disabled-defined-core.comp: skip
@@ -4875,10 +4880,10 @@ spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.geom: skip
 summary:
        name:  results
        ----  --------
-       pass:     9909
+       pass:     9904
        fail:        2
       crash:        0
-       skip:     4872
+       skip:     4877
     timeout:        0
        warn:        0
  incomplete:        0
diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt
index 391af3bd8b7..b493665d66d 100644
--- a/.gitlab-ci/piglit/quick_gl.txt
+++ b/.gitlab-ci/piglit/quick_gl.txt
@@ -612,113 +612,134 @@ spec/arb_shader_image_load_store/max-images/vertex shader max image uniforms tes
 spec/arb_shader_image_load_store/max-size/imagecube max size test/8192x8192x6x1: skip
 spec/arb_shader_image_load_store/max-size/imagecubearray max size test/8192x8192x6x1: skip
 spec/arb_shader_storage_buffer_object/minmax: skip
-spec/arb_shader_texture_image_samples/builtin-image: skip
+spec/arb_shader_texture_image_samples/builtin-image/r8/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/r8/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/r8/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/r8/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16f/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16f/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16f/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16f/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16i/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16i/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16i/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16i/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16ui/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16ui/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16ui/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba16ui/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32f/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32f/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32f/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32f/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32i/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32i/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32i/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32i/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32ui/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32ui/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32ui/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba32ui/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8i/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8i/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8i/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8i/fragment/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8ui/compute/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8ui/compute/image2dmsarray samples test/2x8x16x6: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8ui/fragment/image2dms samples test/2x8x96x1: skip
+spec/arb_shader_texture_image_samples/builtin-image/rgba8ui/fragment/image2dmsarray samples test/2x8x16x6: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-isampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-sampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/fs-usampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-isampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-sampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/gs-usampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-isampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-sampler2dmsarray-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dms-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dms-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dms-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dms-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dms-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dms-8: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-16: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-2: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-32: skip
-spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-4: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-6: skip
 spec/arb_shader_texture_image_samples/texturesamples/vs-usampler2dmsarray-8: skip
 spec/arb_shader_texture_lod/execution/arb_shader_texture_lod-texgrad: fail
@@ -1662,10 +1683,10 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    20045
+       pass:    20103
        fail:      197
       crash:        0
-       skip:     1440
+       skip:     1461
     timeout:        0
        warn:        6
  incomplete:        0
@@ -1674,4 +1695,4 @@ summary:
     changes:        0
       fixes:        0
 regressions:        0
-      total:    21706
+      total:    21785
diff --git a/docs/features.txt b/docs/features.txt
index 1d65b69117a..5893e8a7b13 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -219,7 +219,7 @@ GL 4.5, GLSL 4.50 -- all DONE: nvc0, r600, radeonsi
   GL_ARB_derivative_control                             DONE (i965, nv50, llvmpipe, softpipe, virgl)
   GL_ARB_direct_state_access                            DONE (all drivers)
   GL_ARB_get_texture_sub_image                          DONE (all drivers)
-  GL_ARB_shader_texture_image_samples                   DONE (i965, nv50, virgl)
+  GL_ARB_shader_texture_image_samples                   DONE (i965, nv50, llvmpipe, virgl)
   GL_ARB_texture_barrier                                DONE (freedreno, i965, nv50, llvmpipe, virgl)
   GL_KHR_context_flush_control                          DONE (all - but needs GLX/EGL extension to be useful)
   GL_KHR_robustness                                     DONE (freedreno, i965, virgl)
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 7e2f246f5ca..25f4b0f1bea 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -337,7 +337,6 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
    case PIPE_CAP_DEVICE_RESET_STATUS_QUERY:
    case PIPE_CAP_DEPTH_BOUNDS_TEST:
-   case PIPE_CAP_TGSI_TXQS:
    case PIPE_CAP_FORCE_PERSAMPLE_INTERP:
    case PIPE_CAP_SHAREABLE_SHADERS:
    case PIPE_CAP_TGSI_PACK_HALF_FLOAT:
@@ -397,6 +396,7 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_TGSI_TG4_COMPONENT_IN_SWIZZLE:
    case PIPE_CAP_TGSI_FS_FACE_IS_INTEGER_SYSVAL:
       return 1;
+   case PIPE_CAP_TGSI_TXQS:
    case PIPE_CAP_TGSI_VOTE:
    case PIPE_CAP_LOAD_CONSTBUF:
    case PIPE_CAP_TEXTURE_MULTISAMPLE: