Mesa (7.9): r300g: tell the GLSL compiler to lower the continue opcode

Marek Olšák mareko at kemper.freedesktop.org
Sun Apr 3 10:44:36 PDT 2011


Module: Mesa
Branch: 7.9
Commit: 0140b830af5a5506e37c03fe215089ac9d659454
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0140b830af5a5506e37c03fe215089ac9d659454

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Apr  3 19:42:36 2011 +0200

r300g: tell the GLSL compiler to lower the continue opcode

NOTE: This is a candidate for the stable branches.
(cherry picked from commit f814dd7a8171d9a3c413c3813d2d91d655535041)

Conflicts:

	src/gallium/drivers/r300/r300_screen.c

---

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

diff --git a/src/gallium/drivers/r300/r300_screen.c b/src/gallium/drivers/r300/r300_screen.c
index c349e7f..64c4e15 100644
--- a/src/gallium/drivers/r300/r300_screen.c
+++ b/src/gallium/drivers/r300/r300_screen.c
@@ -204,7 +204,7 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
         case PIPE_SHADER_CAP_MAX_PREDS:
             return is_r500 ? 1 : 0;
         case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
-            return 1;
+            return 0;
         }
         break;
     case PIPE_SHADER_VERTEX:
@@ -231,7 +231,7 @@ static int r300_get_shader_param(struct pipe_screen *pscreen, unsigned shader, e
         case PIPE_SHADER_CAP_MAX_PREDS:
             return is_r500 ? 4 : 0; /* XXX guessed. */
         case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
-            return 1;
+            return 0;
         default:
             break;
         }



More information about the mesa-commit mailing list