diff options
author | Michal Krol <mjkrol@gmail.org> | 2006-03-21 10:37:40 +0000 |
---|---|---|
committer | Michal Krol <mjkrol@gmail.org> | 2006-03-21 10:37:40 +0000 |
commit | 071357096e682e9af59ad45ea5abc444ab431837 (patch) | |
tree | 99fba2183fe97981f7c309d99b206b39e43f5bec /src/mesa/shader/slang/library/slang_shader.syn | |
parent | 519b23b21f9cd6945fd17cdb26e7a6f531cdeec0 (diff) | |
download | external_mesa3d-071357096e682e9af59ad45ea5abc444ab431837.zip external_mesa3d-071357096e682e9af59ad45ea5abc444ab431837.tar.gz external_mesa3d-071357096e682e9af59ad45ea5abc444ab431837.tar.bz2 |
GLSL fixes:
- generate error on NULL pointers in glShaderSourceARB;
- reinstall program object, if current, in glLinkProgramARB;
- vertex and fragment shaders are optional in program object;
- floor asm was wrongly computed for x86 back-end;
- allow for (void) idiom in function prototypes;
- all fixed-state uniforms are updated;
- local variable initializers are working;
- implement texture* and shadow* functions for vertex processor;
- generate error if too many arguments in general constructor;
- trim unused data in general constructor;
- struct r-value field select was badly relocated;
Changes:
- add derived state gl_fog_attrib::_Scale;
- add derived state gl_light::_CosCutoffNeg;
Diffstat (limited to 'src/mesa/shader/slang/library/slang_shader.syn')
-rw-r--r-- | src/mesa/shader/slang/library/slang_shader.syn | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/shader/slang/library/slang_shader.syn b/src/mesa/shader/slang/library/slang_shader.syn index 36d073e..0f15353 100644 --- a/src/mesa/shader/slang/library/slang_shader.syn +++ b/src/mesa/shader/slang/library/slang_shader.syn @@ -583,9 +583,14 @@ declaration_2 init_declarator_list .emit DECLARATION_INIT_DECLARATOR_LIST .and semicolon;
/*
- <function_prototype> ::= <function_declarator> ")"
+ <function_prototype> ::= <function_header> "void" ")"
+ | <function_declarator> ")"
*/
function_prototype
+ function_prototype_1 .or function_prototype_2;
+function_prototype_1
+ function_header .and "void" .and rparen .error RPAREN_EXPECTED .emit PARAMETER_NONE;
+function_prototype_2
function_declarator .and rparen .error RPAREN_EXPECTED .emit PARAMETER_NONE;
/*
|