diff options
| -rw-r--r-- | src/glsl/cl/sl_cl_parse.c | 5 | ||||
| -rw-r--r-- | 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 65df6c38ae7..09456f5219a 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 1b8612d570b..172d7dfe905 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; |