Module: Mesa
Branch: master
Commit: 53609de762d451ad7132149ebf59a712799e08c0
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=53609de762d451ad7132149ebf59a712799e08c0

Author: Edward O'Callaghan <[email protected]>
Date:   Fri Dec 11 22:43:31 2015 +1100

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]>

---

 docs/GL3.txt                             |    2 +-
 src/gallium/drivers/softpipe/sp_screen.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/GL3.txt b/docs/GL3.txt
index 7eda002..84b5a17 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 2ae72b2..9939720 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:

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to