From 28d1f604563d9c738a4c5630364d0e6b4e9b13ff Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 1 Jul 2013 11:33:28 +0200 Subject: mesa git update 1 Jul 2013 mesa commit bf95ca7de0c02a00a75d1d5e2693a33b68ff784d --- mesalib/src/mesa/program/prog_execute.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mesalib/src/mesa/program/prog_execute.c') 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)]; -- cgit v1.2.3