summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2015-07-22 01:24:39 +0100
committerDave Airlie <[email protected]>2015-07-30 09:00:25 +0100
commitaf1e6aa75b7f518cc6b08717fa8844370be3f05c (patch)
tree946a4a79d157bfac5a45db956093e42fdb274bd4
parent3c73c418713adec52389e2723e38bf47df13a24b (diff)
radeonsi: enable GL4.1 and update documentation (v2)
This enables GL4.1 for radeonsi, and updates the docs in the correct places. v2: enable only for llvm 3.7 which has fixes in place. Reviewed-by: Marek Olšák <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
-rw-r--r--docs/GL3.txt16
-rw-r--r--docs/relnotes/10.7.0.html1
-rw-r--r--src/gallium/drivers/radeonsi/si_pipe.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt
index 56753fddf4d..dd4728ce843 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -96,18 +96,18 @@ GL 4.0, GLSL 4.00 --- all DONE: nvc0
GL_ARB_draw_buffers_blend DONE (i965, nv50, r600, radeonsi, llvmpipe, softpipe)
GL_ARB_draw_indirect DONE (i965, r600, radeonsi, llvmpipe, softpipe)
- GL_ARB_gpu_shader5 DONE (i965)
+ GL_ARB_gpu_shader5 DONE (i965, radeonsi)
- 'precise' qualifier DONE
- - Dynamically uniform sampler array indices DONE (r600, radeonsi, softpipe)
- - Dynamically uniform UBO array indices DONE (r600, radeonsi)
+ - Dynamically uniform sampler array indices DONE (r600, softpipe)
+ - Dynamically uniform UBO array indices DONE (r600)
- Implicit signed -> unsigned conversions DONE
- Fused multiply-add DONE ()
- - Packing/bitfield/conversion functions DONE (r600, radeonsi, softpipe)
- - Enhanced textureGather DONE (r600, radeonsi, softpipe)
- - Geometry shader instancing DONE (r600, radeonsi, llvmpipe, softpipe)
+ - Packing/bitfield/conversion functions DONE (r600, softpipe)
+ - Enhanced textureGather DONE (r600, softpipe)
+ - Geometry shader instancing DONE (r600, llvmpipe, softpipe)
- Geometry shader multiple streams DONE ()
- - Enhanced per-sample shading DONE (r600, radeonsi)
- - Interpolation functions DONE (r600, radeonsi)
+ - Enhanced per-sample shading DONE (r600)
+ - Interpolation functions DONE (r600)
- New overload resolution rules DONE
GL_ARB_gpu_shader_fp64 DONE (radeonsi, llvmpipe, softpipe)
GL_ARB_sample_shading DONE (i965, nv50, r600, radeonsi)
diff --git a/docs/relnotes/10.7.0.html b/docs/relnotes/10.7.0.html
index 2df18c0532d..92ae20fe964 100644
--- a/docs/relnotes/10.7.0.html
+++ b/docs/relnotes/10.7.0.html
@@ -50,6 +50,7 @@ Note: some of the new features are only available with certain drivers.
<li>GL_ARB_fragment_layer_viewport on radeonsi</li>
<li>GL_ARB_framebuffer_no_attachments on i965</li>
<li>GL_ARB_get_texture_sub_image for all drivers</li>
+<li>GL_ARB_gpu_shader5 on radeonsi</li>
<li>GL_ARB_gpu_shader_fp64 on llvmpipe, radeonsi</li>
<li>GL_ARB_shader_stencil_export on llvmpipe</li>
<li>GL_ARB_shader_subroutine on core profile all drivers</li>
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index a120282e973..82a6033f694 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -272,7 +272,7 @@ static int si_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
return 4;
case PIPE_CAP_GLSL_FEATURE_LEVEL:
- return 330;
+ return HAVE_LLVM >= 0x0307 ? 410 : 330;
case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
return MIN2(sscreen->b.info.vram_size, 0xFFFFFFFF);