diff options
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/prog_execute.c | 6 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/program_parse.y | 10 |
2 files changed, 2 insertions, 14 deletions
diff --git a/mesalib/src/mesa/program/prog_execute.c b/mesalib/src/mesa/program/prog_execute.c index b902006ef..560332a6e 100644 --- a/mesalib/src/mesa/program/prog_execute.c +++ b/mesalib/src/mesa/program/prog_execute.c @@ -145,7 +145,7 @@ get_src_register_pointer(const struct prog_src_register *source, _mesa_problem(NULL, "Invalid src register file %d in get_src_register_pointer()", source->File); - return NULL; + return ZeroVec; } } @@ -184,7 +184,7 @@ get_dst_register_pointer(const struct prog_dst_register *dest, _mesa_problem(NULL, "Invalid dest register file %d in get_dst_register_pointer()", dest->File); - return NULL; + return dummyReg; } } @@ -199,7 +199,6 @@ fetch_vector4(const struct prog_src_register *source, const struct gl_program_machine *machine, GLfloat result[4]) { const GLfloat *src = get_src_register_pointer(source, machine); - ASSERT(src); if (source->Swizzle == SWIZZLE_NOOP) { /* no swizzling */ @@ -302,7 +301,6 @@ fetch_vector1(const struct prog_src_register *source, const struct gl_program_machine *machine, GLfloat result[4]) { const GLfloat *src = get_src_register_pointer(source, machine); - ASSERT(src); result[0] = src[GET_SWZ(source->Swizzle, 0)]; diff --git a/mesalib/src/mesa/program/program_parse.y b/mesalib/src/mesa/program/program_parse.y index cbf3fe6ca..e2da63347 100644 --- a/mesalib/src/mesa/program/program_parse.y +++ b/mesalib/src/mesa/program/program_parse.y @@ -1145,20 +1145,10 @@ vtxAttribItem: POSITION } | COLOR optColorType { - if (!state->ctx->Extensions.EXT_secondary_color) { - yyerror(& @2, state, "GL_EXT_secondary_color not supported"); - YYERROR; - } - $$ = VERT_ATTRIB_COLOR0 + $2; } | FOGCOORD { - if (!state->ctx->Extensions.EXT_fog_coord) { - yyerror(& @1, state, "GL_EXT_fog_coord not supported"); - YYERROR; - } - $$ = VERT_ATTRIB_FOG; } | TEXCOORD optTexCoordUnitNum |