Module: Mesa
Branch: glsl-pp-rework-2
Commit: cd41395073839365b79e6b1cca2e35e08a57bf7b
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=cd41395073839365b79e6b1cca2e35e08a57bf7b

Author: Michal Krol <[email protected]>
Date:   Tue Sep 22 12:52:53 2009 +0200

grammar: Differentiate between uints and floats.

---

 src/mesa/shader/grammar/grammar.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/shader/grammar/grammar.c 
b/src/mesa/shader/grammar/grammar.c
index eb58e0c..b83920a 100644
--- a/src/mesa/shader/grammar/grammar.c
+++ b/src/mesa/shader/grammar/grammar.c
@@ -2067,8 +2067,10 @@ static int get_spec (const byte **text, spec **sp, 
map_str *maps, map_byte *mapb
             s->m_token = SL_PP_COLON;
          } else if (!strcmp(s->m_string, "@ID")) {
             s->m_token = SL_PP_IDENTIFIER;
-         } else if (!strcmp(s->m_string, "@NUM")) {
-            s->m_token = SL_PP_NUMBER;
+         } else if (!strcmp(s->m_string, "@UINT")) {
+            s->m_token = SL_PP_UINT;
+         } else if (!strcmp(s->m_string, "@FLOAT")) {
+            s->m_token = SL_PP_FLOAT;
          } else if (!strcmp(s->m_string, "@EOF")) {
             s->m_token = SL_PP_EOF;
          } else {

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

Reply via email to