summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Kennard <glenn.kennard@gmail.com>2015-10-07 17:17:34 +0200
committerDave Airlie <airlied@redhat.com>2015-10-13 08:55:42 +1000
commit24a1a157a694e961aaad611a8bf9d47ce8cf47f6 (patch)
tree8f3807b4a28f21b39c7292c40c8688e5c2074ed3
parent1befb7ed9856381cbfe874f361fae73b8e331bb4 (diff)
r600g: Enable GL_ARB_gpu_shader5 extension
Signed-off-by: Glenn Kennard <glenn.kennard@gmail.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--docs/GL3.txt16
-rw-r--r--docs/relnotes/11.1.0.html1
-rw-r--r--src/gallium/drivers/r600/r600_pipe.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt
index e17e783d3310..6503e2ab1da0 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 d4f30d0da62d..dcf425e4c68c 100644
--- a/docs/relnotes/11.1.0.html
+++ b/docs/relnotes/11.1.0.html
@@ -46,6 +46,7 @@ Note: some of the new features are only available with certain drivers.
<ul>
<li>GL_ARB_blend_func_extended on freedreno (a3xx)</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>
<li>GL_ARB_shader_storage_buffer_object on i965</li>
<li>GL_ARB_shader_texture_image_samples on i965, nv50, nvc0, r600, radeonsi</li>
<li>GL_ARB_texture_barrier / GL_NV_texture_barrier on i965</li>
diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
index efb4889e5625..32ce76a9e078 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;