Mesa (master): radeonsi: enable ARB_sample_shading

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed May  7 13:15:41 2014 +0200

radeonsi: enable ARB_sample_shading

---

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

diff --git a/docs/GL3.txt b/docs/GL3.txt
index c360f2c..c98dd9f 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -114,7 +114,7 @@ GL 4.0:
   - Interpolation functions                            started
   - New overload resolution rules                      not started
   GL_ARB_gpu_shader_fp64                               not started
-  GL_ARB_sample_shading                                DONE (i965, nv50, nvc0)
+  GL_ARB_sample_shading                                DONE (i965, nv50, nvc0, radeonsi)
   GL_ARB_shader_subroutine                             not started
   GL_ARB_tessellation_shader                           not started
   GL_ARB_texture_buffer_object_rgb32                   DONE (i965, nvc0, r600, radeonsi, softpipe)
diff --git a/docs/relnotes/10.3.html b/docs/relnotes/10.3.html
index 6bb9e79..0c8114b 100644
--- a/docs/relnotes/10.3.html
+++ b/docs/relnotes/10.3.html
@@ -44,6 +44,7 @@ Note: some of the new features are only available with certain drivers.
 </p>
 
 <ul>
+<li>GL_ARB_sample_shading on radeonsi</li>
 <li>GL_ARB_stencil_texturing on nv50, nvc0, r600, and radeonsi</li>
 <li>GL_ARB_texture_cube_map_array on radeonsi</li>
 </ul>
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index bd878fe..4b96f20 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -213,6 +213,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
 	case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
 	case PIPE_CAP_CUBE_MAP_ARRAY:
+	case PIPE_CAP_SAMPLE_SHADING:
 		return 1;
 
 	case PIPE_CAP_TEXTURE_MULTISAMPLE:
@@ -246,7 +247,6 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 	case PIPE_CAP_TGSI_TEXCOORD:
 	case PIPE_CAP_FAKE_SW_MSAA:
 	case PIPE_CAP_TEXTURE_QUERY_LOD:
-	case PIPE_CAP_SAMPLE_SHADING:
 	case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
 	case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
 		return 0;