radeonsi: enable ARB_shader_ballot

Require LLVM 5.0 or later because LLVM 4.0 is easily fooled into
putting the lane select of llvm.amdgcn.readlane into a VGPR and then
fails to continue to compile.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/docs/features.txt b/docs/features.txt
index 6513c693fa073bfa3045fcc96a93cfe06eb5fffa..5cc109036bd01e01583ff5cab54366c3640221af 100644 (file)
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -292,7 +292,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
   GL_ARB_sample_locations                               not started
   GL_ARB_seamless_cubemap_per_texture                   DONE (i965, nvc0, radeonsi, r600, softpipe, swr)
   GL_ARB_shader_atomic_counter_ops                      DONE (i965/gen7+, nvc0, radeonsi, softpipe)
-  GL_ARB_shader_ballot                                  not started
+  GL_ARB_shader_ballot                                  DONE (radeonsi)
   GL_ARB_shader_clock                                   DONE (i965/gen7+, radeonsi)
   GL_ARB_shader_draw_parameters                         DONE (i965, nvc0, radeonsi)
   GL_ARB_shader_group_vote                              DONE (nvc0, radeonsi)

diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html
index 74e389cdfea02fe6de5e10c7a3bff3d914a3b602..7419970283d5a9efd2d43741ff04795204516e32 100644 (file)
--- a/docs/relnotes/17.1.0.html
+++ b/docs/relnotes/17.1.0.html
@@ -45,6 +45,7 @@ Note: some of the new features are only available with certain drivers.
 
 <ul>
 <li>GL_ARB_gpu_shader_int64 on i965/gen8+, nvc0, radeonsi, softpipe, llvmpipe</li>
+<li>GL_ARB_shader_ballot on radeonsi</li>
 <li>GL_ARB_shader_clock on radeonsi</li>
 <li>GL_ARB_shader_group_vote on radeonsi</li>
 <li>GL_ARB_sparse_buffer on radeonsi/CIK+</li>

diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 2a6d1510e59533b034b6b8e91a97120e36920ebb..14a71e3d9ae5db614643c3fd0f2aea14bc28ddeb 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -431,6 +431,9 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_TGSI_VOTE:
                return HAVE_LLVM >= 0x0400;
 
+       case PIPE_CAP_TGSI_BALLOT:
+               return HAVE_LLVM >= 0x0500;
+
        case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
                return !SI_BIG_ENDIAN && sscreen->b.info.has_userptr;
 
@@ -503,7 +506,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_TGSI_MUL_ZERO_WINS:
        case PIPE_CAP_UMA:
        case PIPE_CAP_POLYGON_MODE_FILL_RECTANGLE:
-       case PIPE_CAP_TGSI_BALLOT:
                return 0;
 
        case PIPE_CAP_QUERY_BUFFER_OBJECT: