Mesa (master): r300g/swtcl: advertise draw_instanced and primitive_restart

Marek Olšák mareko at kemper.freedesktop.org
Sat Mar 5 18:34:51 UTC 2011


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Mar  5 17:37:15 2011 +0100

r300g/swtcl: advertise draw_instanced and primitive_restart

---

 src/gallium/drivers/r300/r300_screen.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 6c0dc99..d881a0f 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -125,11 +125,14 @@ static int r300_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
         case PIPE_CAP_DEPTH_CLAMP:
         case PIPE_CAP_DEPTHSTENCIL_CLEAR_SEPARATE:
         case PIPE_CAP_SHADER_STENCIL_EXPORT:
+        case PIPE_CAP_ARRAY_TEXTURES:
+            return 0;
+
+        /* SWTCL-only features. */
         case PIPE_CAP_STREAM_OUTPUT:
         case PIPE_CAP_PRIMITIVE_RESTART:
         case PIPE_CAP_TGSI_INSTANCEID:
-        case PIPE_CAP_ARRAY_TEXTURES:
-            return 0;
+            return !r300screen->caps.has_tcl;
 
         /* Texturing. */
         case PIPE_CAP_MAX_TEXTURE_IMAGE_UNITS:




More information about the mesa-commit mailing list