diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-22 12:54:45 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-22 12:54:45 +0200 |
| commit | b1e6514a94effb1a5ea03c31f5a50e9e60638e51 (patch) | |
| tree | bf5bbbe9e8dbbab7e0c0a28c90c46bee157a6202 | |
| parent | cd41395073839365b79e6b1cca2e35e08a57bf7b (diff) | |
slang: Differentiate between uints and floats.
| -rw-r--r-- | src/mesa/shader/slang/library/slang_shader.syn | 4 | ||||
| -rw-r--r-- | src/mesa/shader/slang/library/slang_shader_syn.h | 4 | ||||
| -rw-r--r-- | src/mesa/shader/slang/slang_compile.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/shader/slang/library/slang_shader.syn b/src/mesa/shader/slang/library/slang_shader.syn index f6bf7f1e546..11f9825c016 100644 --- a/src/mesa/shader/slang/library/slang_shader.syn +++ b/src/mesa/shader/slang/library/slang_shader.syn @@ -1362,10 +1362,10 @@ identifier "@ID" .emit *; float - "@NUM" .emit 1 .emit *; + "@FLOAT" .emit 1 .emit *; integer - "@NUM" .emit 1 .emit *; + "@UINT" .emit 1 .emit *; boolean "true" .emit '1' .emit '\0' .or diff --git a/src/mesa/shader/slang/library/slang_shader_syn.h b/src/mesa/shader/slang/library/slang_shader_syn.h index 9a56643d2f1..488cf1a5044 100644 --- a/src/mesa/shader/slang/library/slang_shader_syn.h +++ b/src/mesa/shader/slang/library/slang_shader_syn.h @@ -631,9 +631,9 @@ "identifier\n" " \"@ID\" .emit *;\n" "float\n" -" \"@NUM\" .emit 1 .emit *;\n" +" \"@FLOAT\" .emit 1 .emit *;\n" "integer\n" -" \"@NUM\" .emit 1 .emit *;\n" +" \"@UINT\" .emit 1 .emit *;\n" "boolean\n" " \"true\" .emit '1' .emit '\\0' .or\n" " \"false\" .emit '0' .emit '\\0';\n" diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c index fb452e5d2c5..ce3a85ebf8a 100644 --- a/src/mesa/shader/slang/slang_compile.c +++ b/src/mesa/shader/slang/slang_compile.c @@ -2683,7 +2683,8 @@ compile_with_grammar(grammar id, const char *source, slang_code_unit * unit, case SL_PP_QUESTION: case SL_PP_COLON: case SL_PP_IDENTIFIER: - case SL_PP_NUMBER: + case SL_PP_UINT: + case SL_PP_FLOAT: *dst++ = *src++; break; |