Mesa (master): mesa: make the arguments in the asm statemants optional
Zack Rusin
zack at kemper.freedesktop.org
Wed Jun 30 01:42:20 UTC 2010
Module: Mesa
Branch: master
Commit: 0d68d01347383a8878c9678706cc3bd212b54bbd
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0d68d01347383a8878c9678706cc3bd212b54bbd
Author: Zack Rusin <zackr at vmware.com>
Date: Tue Jun 29 21:45:41 2010 -0400
mesa: make the arguments in the asm statemants optional
geometry shaders emit/end functions don't take any arguments
---
src/glsl/cl/sl_cl_parse.c | 5 ++---
src/mesa/state_tracker/st_program.c | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c
index 65df6c3..09456f5 100644
--- a/src/glsl/cl/sl_cl_parse.c
+++ b/src/glsl/cl/sl_cl_parse.c
@@ -2191,9 +2191,8 @@ _parse_asm_statement(struct parse_context *ctx,
if (_parse_identifier(ctx, &p)) {
return -1;
}
- if (_parse_asm_arguments(ctx, &p)) {
- return -1;
- }
+ /* optional arguments */
+ _parse_asm_arguments(ctx, &p);
if (_parse_token(ctx, SL_PP_SEMICOLON, &p)) {
return -1;
}
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index 1b8612d..172d7df 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -489,7 +489,6 @@ st_translate_geometry_program(struct st_context *st,
return;
}
- assert(0);
/* which vertex output goes to the first geometry input */
if (inputsRead & GEOM_BIT_VERTICES)
vslot = 0;
More information about the mesa-commit
mailing list