summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward O'Callaghan <[email protected]>2015-12-11 22:43:31 +1100
committerRoland Scheidegger <[email protected]>2015-12-11 20:09:21 +0100
commit53609de762d451ad7132149ebf59a712799e08c0 (patch)
tree43eed51f9ef637c64630dc4b485a12096ac268db
parent00f97ad5def91d485de0e5dd79fd39fae9ed3ce1 (diff)
softpipe: enable GL_ARB_viewport_array support, update GL3.txt doc
Signed-off-by: Edward O'Callaghan <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r--docs/GL3.txt2
-rw-r--r--src/gallium/drivers/softpipe/sp_screen.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/GL3.txt b/docs/GL3.txt
index 7eda0028997..84b5a172d58 100644
--- a/docs/GL3.txt
+++ b/docs/GL3.txt
@@ -128,7 +128,7 @@ GL 4.1, GLSL 4.10 --- all DONE: nvc0, r600, radeonsi
GL_ARB_separate_shader_objects DONE (all drivers)
GL_ARB_shader_precision DONE (all drivers that support GLSL 4.10)
GL_ARB_vertex_attrib_64bit DONE (llvmpipe, softpipe)
- GL_ARB_viewport_array DONE (i965, nv50, llvmpipe)
+ GL_ARB_viewport_array DONE (i965, nv50, llvmpipe, softpipe)
GL 4.2, GLSL 4.20:
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index 2ae72b2332b..9939720e259 100644
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -187,7 +187,7 @@ softpipe_get_param(struct pipe_screen *screen, enum pipe_cap param)
case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER:
return 0;
case PIPE_CAP_MAX_VIEWPORTS:
- return 1;
+ return PIPE_MAX_VIEWPORTS;
case PIPE_CAP_ENDIANNESS:
return PIPE_ENDIAN_NATIVE;
case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS: