diff options
author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-08-16 09:30:14 -0600 |
---|---|---|
committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-08-16 09:30:14 -0600 |
commit | 1f4997c2aaf424c8a12cc6fdb1dd994f66074a1d (patch) | |
tree | de14cfe88863d678bc618b54a7569f831fd7f590 /src/mesa/shader/slang/library/slang_pp_version.syn | |
parent | 1b39b92e6d7d3a7e6c39b985ffff32a79a510333 (diff) |
mesa: import latest GLSL code from gallium-0.1 branch
Diffstat (limited to 'src/mesa/shader/slang/library/slang_pp_version.syn')
-rw-r--r-- | src/mesa/shader/slang/library/slang_pp_version.syn | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/shader/slang/library/slang_pp_version.syn b/src/mesa/shader/slang/library/slang_pp_version.syn index d5e9317b5d..3fe1a57ba2 100644 --- a/src/mesa/shader/slang/library/slang_pp_version.syn +++ b/src/mesa/shader/slang/library/slang_pp_version.syn @@ -31,11 +31,9 @@ .syntax version_directive; version_directive - version_directive_1 .and .loop version_directive_2; + version_directive_1; version_directive_1 prior_optional_spaces .and optional_version_directive .and .true .emit $; -version_directive_2 - prior_optional_spaces .and version_directive_body .and .true .emit $; optional_version_directive version_directive_body .or .true .emit 10 .emit 1; @@ -45,13 +43,16 @@ version_directive_body new_line; version_number - version_number_110 .or version_number_120; + version_number_100 .or version_number_110 .or version_number_120; + +version_number_100 + leading_zeroes .and "100" .emit 0 .emit 1; version_number_110 leading_zeroes .and "110" .emit 10 .emit 1; version_number_120 - leading_zeroes .and "120" .emit 20 .emit 1; + leading_zeroes .and "120" .emit 20 .emit 1; leading_zeroes .loop zero; |