summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2014-08-09 20:03:50 -0400
committerIlia Mirkin <[email protected]>2014-08-13 09:59:04 -0400
commit8049e5a1f68f9b852d31d91b28828391c5df754d (patch)
treef6993c32bcf3fbc0697fa63584651b544dd433ed
parent6f1edf3cbf0ce4cb8e95f2d8bd68c9c26d3f840c (diff)
nvc0: increase GLSL level to 400 to enable ARB_gpu_shader5
Signed-off-by: Ilia Mirkin <[email protected]>
-rw-r--r--docs/GL3.txt16
-rw-r--r--docs/relnotes/10.3.html1
-rw-r--r--src/gallium/drivers/nouveau/nvc0/nvc0_screen.c2
3 files changed, 10 insertions, 9 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt
index 75ac69a34c1..52b0ce45bb9 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -94,16 +94,16 @@ GL 4.0, GLSL 4.00:
GL_ARB_draw_buffers_blend DONE (i965, nv50, nvc0, r600, radeonsi, softpipe)
GL_ARB_draw_indirect DONE (i965, nvc0, radeonsi, softpipe, llvmpipe)
- GL_ARB_gpu_shader5 started
+ GL_ARB_gpu_shader5 DONE (nvc0)
- 'precise' qualifier DONE
- - Dynamically uniform sampler array indices started (Chris)
- - Dynamically uniform UBO array indices started (Chris)
+ - Dynamically uniform sampler array indices DONE ()
+ - Dynamically uniform UBO array indices DONE ()
- Implicit signed -> unsigned conversions DONE
- - Fused multiply-add DONE (i965, nvc0)
- - Packing/bitfield/conversion functions DONE (i965, nvc0, r600)
- - Enhanced textureGather DONE (i965, nvc0, r600, radeonsi)
- - Geometry shader instancing DONE (i965, nvc0)
- - Geometry shader multiple streams DONE (i965, nvc0)
+ - Fused multiply-add DONE (i965)
+ - Packing/bitfield/conversion functions DONE (i965, r600)
+ - Enhanced textureGather DONE (i965, r600, radeonsi)
+ - Geometry shader instancing DONE (i965)
+ - Geometry shader multiple streams DONE (i965)
- Enhanced per-sample shading DONE (i965, r600)
- Interpolation functions DONE (i965)
- New overload resolution rules DONE
diff --git a/docs/relnotes/10.3.html b/docs/relnotes/10.3.html
index 519ea2c6219..a29710639a7 100644
--- a/docs/relnotes/10.3.html
+++ b/docs/relnotes/10.3.html
@@ -61,6 +61,7 @@ Note: some of the new features are only available with certain drivers.
<li>GL_AMD_vertex_shader_viewport_index on i965/gen7+, r600</li>
<li>GL_ARB_clear_texture on i965</li>
<li>GL_OES_compressed_ETC1_RGB8_texture on nv30, nv50, nvc0, r300, r600, radeonsi, softpipe, llvmpipe</li>
+<li>GL_ARB_gpu_shader5 on nvc0</li>
<li>A new software rasterizer driver (kms_swrast_dri.so) that works with
DRM drivers that don't have a full-fledged GEM (such as qxl or simpledrm)</li>
<li>GL_ARB_texture_compression_bptc on i965/gen7+, nvc0</li>
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
index 686da329869..d372a0fc36b 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
@@ -90,7 +90,7 @@ nvc0_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
return 65536;
case PIPE_CAP_GLSL_FEATURE_LEVEL:
- return 330;
+ return 400;
case PIPE_CAP_MAX_RENDER_TARGETS:
return 8;
case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS: