Signed-off-by: Glenn Kennard <glenn.kenn...@gmail.com>
---
Now that SB supports the GS5 features we can safely enable the
extension.
Note that gallium state tracker clamps the GLSL language / GL version
since GL_ARB_tessellation_shader isn't implemented yet.
docs/GL3.txt | 16 ++++++++--------
docs/relnotes/11.1.0.html | 1 +
src/gallium/drivers/r600/r600_pipe.c | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/docs/GL3.txt b/docs/GL3.txt
index e17e783..6503e2a 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -96,18 +96,18 @@ GL 4.0, GLSL 4.00 --- all DONE: nvc0, radeonsi
GL_ARB_draw_buffers_blend DONE (i965, nv50, r600,
llvmpipe, softpipe)
GL_ARB_draw_indirect DONE (i965, r600,
llvmpipe, softpipe)
- GL_ARB_gpu_shader5 DONE (i965)
+ GL_ARB_gpu_shader5 DONE (i965, r600)
- 'precise' qualifier DONE
- - Dynamically uniform sampler array indices DONE (r600, softpipe)
- - Dynamically uniform UBO array indices DONE (r600)
+ - Dynamically uniform sampler array indices DONE (softpipe)
+ - Dynamically uniform UBO array indices DONE ()
- Implicit signed -> unsigned conversions DONE
- Fused multiply-add DONE ()
- - Packing/bitfield/conversion functions DONE (r600, softpipe)
- - Enhanced textureGather DONE (r600, softpipe)
- - Geometry shader instancing DONE (r600, llvmpipe,
softpipe)
+ - Packing/bitfield/conversion functions DONE (softpipe)
+ - Enhanced textureGather DONE (softpipe)
+ - Geometry shader instancing DONE (llvmpipe,
softpipe)
- Geometry shader multiple streams DONE ()
- - Enhanced per-sample shading DONE (r600)
- - Interpolation functions DONE (r600)
+ - Enhanced per-sample shading DONE ()
+ - Interpolation functions DONE ()
- New overload resolution rules DONE
GL_ARB_gpu_shader_fp64 DONE (r600, llvmpipe,
softpipe)
GL_ARB_sample_shading DONE (i965, nv50, r600)
diff --git a/docs/relnotes/11.1.0.html b/docs/relnotes/11.1.0.html
index c755c98..e537d98 100644
--- a/docs/relnotes/11.1.0.html
+++ b/docs/relnotes/11.1.0.html
@@ -50,6 +50,7 @@ Note: some of the new features are only available with
certain drivers.
<li>GL_ARB_texture_barrier / GL_NV_texture_barrier on i965</li>
<li>GL_ARB_texture_query_lod on softpipe</li>
<li>GL_ARB_gpu_shader_fp64 on r600 for Cypress/Cayman/Aruba chips</li>
+<li>GL_ARB_gpu_shader5 on r600 for Evergreen and later chips</li>
</ul>
<h2>Bug fixes</h2>
diff --git a/src/gallium/drivers/r600/r600_pipe.c
b/src/gallium/drivers/r600/r600_pipe.c
index efb4889..32ce76a 100644
--- a/src/gallium/drivers/r600/r600_pipe.c
+++ b/src/gallium/drivers/r600/r600_pipe.c
@@ -305,7 +305,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum
pipe_cap param)
case PIPE_CAP_GLSL_FEATURE_LEVEL:
if (family >= CHIP_CEDAR)
- return 330;
+ return 410;
/* pre-evergreen geom shaders need newer kernel */
if (rscreen->b.info.drm_minor >= 37)
return 330;
--
1.9.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
