llvmpipe: enable ARB_shader_draw_parameters.

All the bits should be in place for this now.

Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/.gitlab-ci/piglit/glslparser.txt b/.gitlab-ci/piglit/glslparser.txt
index 6b89b293e9bde9e633006b78ff7ffce80b4643f0..8c4681014c3ae9c25115358eda75b2309a4e9ccc 100644 (file)
--- a/.gitlab-ci/piglit/glslparser.txt
+++ b/.gitlab-ci/piglit/glslparser.txt
@@ -1274,16 +1274,20 @@ spec/arb_shader_clock/preprocessor/enabled-core.geom: skip
 spec/arb_shader_clock/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_clock/preprocessor/enabled-core.tese: skip
 spec/arb_shader_clock/preprocessor/enabled-core.vert: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.comp: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.frag: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.geom: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.tese: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-defined-core.vert: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.comp: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.frag: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.geom: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.tesc: skip
 spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.tese: skip
-spec/arb_shader_draw_parameters/preprocessor/enabled-core.comp: skip
-spec/arb_shader_draw_parameters/preprocessor/enabled-core.frag: skip
-spec/arb_shader_draw_parameters/preprocessor/enabled-core.geom: skip
+spec/arb_shader_draw_parameters/preprocessor/disabled-undefined-core.vert: skip
 spec/arb_shader_draw_parameters/preprocessor/enabled-core.tesc: skip
 spec/arb_shader_draw_parameters/preprocessor/enabled-core.tese: skip
-spec/arb_shader_draw_parameters/preprocessor/enabled-core.vert: skip
 spec/arb_shader_group_vote/preprocessor/disabled-defined-core.tesc: skip
 spec/arb_shader_group_vote/preprocessor/disabled-defined-core.tese: skip
 spec/arb_shader_group_vote/preprocessor/disabled-undefined-core.tesc: skip
@@ -5088,10 +5092,10 @@ spec/oes_texture_storage_multisample_2d_array/preprocessor/enabled-es.tese: skip
 summary:
        name:  results
        ----  --------
-       pass:     9696
+       pass:     9692
        fail:        2
       crash:        0
-       skip:     5085
+       skip:     5089
     timeout:        0
        warn:        0
  incomplete:        0

diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt
index c808b487bc4a8accbc3ea89ff632e128a354b1f5..1836b1b2b03bdda3bfea3c5728dccd8ba291edaf 100644 (file)
--- a/.gitlab-ci/piglit/quick_gl.txt
+++ b/.gitlab-ci/piglit/quick_gl.txt
@@ -678,20 +678,6 @@ spec/arb_shader_atomic_counters/semantics/tessellation control shader atomic bui
 spec/arb_shader_atomic_counters/semantics/tessellation evaluation shader atomic built-in semantics: skip
 spec/arb_shader_atomic_counters/unused-result/tessellation control shader atomic built-in semantics: skip
 spec/arb_shader_atomic_counters/unused-result/tessellation evaluation shader atomic built-in semantics: skip
-spec/arb_shader_draw_parameters/baseinstance: skip
-spec/arb_shader_draw_parameters/baseinstance-indirect: skip
-spec/arb_shader_draw_parameters/basevertex: skip
-spec/arb_shader_draw_parameters/basevertex-baseinstance: skip
-spec/arb_shader_draw_parameters/basevertex-baseinstance-indirect: skip
-spec/arb_shader_draw_parameters/basevertex-indirect: skip
-spec/arb_shader_draw_parameters/drawid: skip
-spec/arb_shader_draw_parameters/drawid-indirect: skip
-spec/arb_shader_draw_parameters/drawid-indirect-baseinstance: skip
-spec/arb_shader_draw_parameters/drawid-indirect-basevertex: skip
-spec/arb_shader_draw_parameters/drawid-indirect-vertexid: skip
-spec/arb_shader_draw_parameters/drawid-vertexid: skip
-spec/arb_shader_draw_parameters/vertexid-zerobased: skip
-spec/arb_shader_draw_parameters/vertexid-zerobased-indirect: skip
 spec/arb_shader_image_load_store/early-z/occlusion query test/early-z pass: fail
 spec/arb_shader_image_load_store/indexing/compute shader/dynamically uniform indexing test: fail
 spec/arb_shader_image_load_store/indexing/fragment shader/dynamically uniform indexing test: fail
@@ -2236,10 +2222,10 @@ wgl/wgl-sanity: skip
 summary:
        name:  results
        ----  --------
-       pass:    19287
+       pass:    19301
        fail:      237
       crash:        2
-       skip:     1976
+       skip:     1962
     timeout:        0
        warn:        2
  incomplete:        0

diff --git a/docs/features.txt b/docs/features.txt
index 150e0d5fd22ebc596a41c69216b3a1d002cbfe59..551e2f8a63a93b52c034afa9d238fc5bd6f4156e 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -231,7 +231,7 @@ GL 4.6, GLSL 4.60 -- all DONE: radeonsi
   GL_ARB_pipeline_statistics_query                      DONE (i965, nvc0, r600, llvmpipe, softpipe, swr)
   GL_ARB_polygon_offset_clamp                           DONE (freedreno, i965, nv50, nvc0, r600, llvmpipe, swr, virgl)
   GL_ARB_shader_atomic_counter_ops                      DONE (freedreno/a5xx+, i965/gen7+, nvc0, r600, llvmpipe, softpipe, virgl)
-  GL_ARB_shader_draw_parameters                         DONE (i965, nvc0)
+  GL_ARB_shader_draw_parameters                         DONE (i965, llvmpipe, nvc0)
   GL_ARB_shader_group_vote                              DONE (i965, nvc0)
   GL_ARB_spirv_extensions                               DONE (i965/gen7+)
   GL_ARB_texture_filter_anisotropic                     DONE (freedreno, i965, nv50, nvc0, r600, softpipe (*), llvmpipe (*))

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 6688c6e36c2f9229037a59e1721a9a1789ca929e..94810de8372eb83dc301a33a9a20f5e3b8a3010c 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -324,6 +324,8 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
       return 1;
    case PIPE_CAP_QUERY_BUFFER_OBJECT:
       return 1;
+   case PIPE_CAP_DRAW_PARAMETERS:
+      return 1;
    case PIPE_CAP_MULTISAMPLE_Z_RESOLVE:
    case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
    case PIPE_CAP_DEVICE_RESET_STATUS_QUERY:
@@ -332,7 +334,6 @@ llvmpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
    case PIPE_CAP_TGSI_TXQS:
    case PIPE_CAP_FORCE_PERSAMPLE_INTERP:
    case PIPE_CAP_SHAREABLE_SHADERS:
-   case PIPE_CAP_DRAW_PARAMETERS:
    case PIPE_CAP_TGSI_PACK_HALF_FLOAT:
    case PIPE_CAP_MULTI_DRAW_INDIRECT:
    case PIPE_CAP_MULTI_DRAW_INDIRECT_PARAMS: