Mesa (master): r300g: return shader caps from Draw for SWTCL vertex shaders

Marek Olšák mareko at kemper.freedesktop.org
Sun Nov 14 22:04:43 UTC 2010


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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Nov 14 22:32:46 2010 +0100

r300g: return shader caps from Draw for SWTCL vertex shaders

---

 src/gallium/drivers/r300/r300_screen.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index 37563b5..fd2f338 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -32,6 +32,8 @@
 #include "r300_winsys.h"
 #include "r300_public.h"
 
+#include "draw/draw_context.h"
+
 /* Return the identifier behind whom the brave coders responsible for this
  * amalgamation of code, sweat, and duct tape, routinely obscure their names.
  *
@@ -215,6 +217,10 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
         }
         break;
     case PIPE_SHADER_VERTEX:
+        if (!r300screen->caps.has_tcl) {
+            return draw_get_shader_param(shader, param);
+        }
+
         switch (param)
         {
         case PIPE_SHADER_CAP_MAX_INSTRUCTIONS:




More information about the mesa-commit mailing list