Mesa (master): radeonsi: enable ARB_shader_viewport_layer_array

[Nicolai Hähnle]

Module: Mesa
Branch: master
Commit: 2ac03e90fb653944d985b513ecf5240cff2e680a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2ac03e90fb653944d985b513ecf5240cff2e680a

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Thu Apr 13 22:16:26 2017 +0200

radeonsi: enable ARB_shader_viewport_layer_array

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

---

 docs/features.txt                      | 2 +-
 docs/relnotes/17.1.0.html              | 1 +
 src/gallium/drivers/radeonsi/si_pipe.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/features.txt b/docs/features.txt
index a2d7785827..7ca5fd3015 100644
--- a/docs/features.txt
+++ b/docs/features.txt
@@ -297,7 +297,7 @@ Khronos, ARB, and OES extensions that are not part of any OpenGL or OpenGL ES ve
   GL_ARB_shader_draw_parameters                         DONE (i965, nvc0, radeonsi)
   GL_ARB_shader_group_vote                              DONE (nvc0, radeonsi)
   GL_ARB_shader_stencil_export                          DONE (i965/gen9+, radeonsi, softpipe, llvmpipe, swr)
-  GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+)
+  GL_ARB_shader_viewport_layer_array                    DONE (i965/gen6+, radeonsi)
   GL_ARB_sparse_buffer                                  DONE (radeonsi/CIK+)
   GL_ARB_sparse_texture                                 not started
   GL_ARB_sparse_texture2                                not started
diff --git a/docs/relnotes/17.1.0.html b/docs/relnotes/17.1.0.html
index 8f237ed527..82086d59c1 100644
--- a/docs/relnotes/17.1.0.html
+++ b/docs/relnotes/17.1.0.html
@@ -48,6 +48,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_shader_ballot on nvc0, radeonsi</li>
 <li>GL_ARB_shader_clock on nv50, nvc0, radeonsi</li>
 <li>GL_ARB_shader_group_vote on radeonsi</li>
+<li>GL_ARB_shader_viewport_layer_array on radeonsi</li>
 <li>GL_ARB_sparse_buffer on radeonsi/CIK+</li>
 <li>GL_ARB_transform_feedback2 on i965/gen6</li>
 <li>GL_ARB_transform_feedback_overflow_query on i965/gen6+</li>
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 29552499d5..f0e24c29cb 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -421,6 +421,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_STREAM_OUTPUT_INTERLEAVE_BUFFERS:
 	case PIPE_CAP_DOUBLES:
 	case PIPE_CAP_TGSI_TEX_TXF_LZ:
+	case PIPE_CAP_TGSI_TES_LAYER_VIEWPORT:
 		return 1;
 
 	case PIPE_CAP_INT64:
@@ -506,7 +507,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_TES_LAYER_VIEWPORT:
 		return 0;
 
 	case PIPE_CAP_QUERY_BUFFER_OBJECT: