Browse Source

mesa: make the arguments in the asm statemants optional

geometry shaders emit/end functions don't take any arguments
tags/mesa-7.9-rc1
Zack Rusin 15 years ago
parent
commit
0d68d01347
2 changed files with 2 additions and 4 deletions
  1. 2
    3
      src/glsl/cl/sl_cl_parse.c
  2. 0
    1
      src/mesa/state_tracker/st_program.c

+ 2
- 3
src/glsl/cl/sl_cl_parse.c View File

@@ -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;
}

+ 0
- 1
src/mesa/state_tracker/st_program.c View File

@@ -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;

Loading…
Cancel
Save