Mesa (master): mesa: Return after assertion failure.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Mon Aug 30 13:12:29 UTC 2010


Module: Mesa
Branch: master
Commit: 4841c0a15adcc722e67d7d246987cd686d3f7a17
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4841c0a15adcc722e67d7d246987cd686d3f7a17

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Aug 30 13:59:24 2010 +0100

mesa: Return after assertion failure.

Addresses the warnings:
warning: ‘target’ may be used uninitialized in this function
warning: ‘target_string’ may be used uninitialized in this function

---

 src/mesa/program/ir_to_mesa.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index 19f3847..af6d734 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2456,7 +2456,7 @@ get_mesa_program(GLcontext *ctx, struct gl_shader_program *shader_program,
       break;
    default:
       assert(!"should not be reached");
-      break;
+      return NULL;
    }
 
    validate_ir_tree(shader->ir);




More information about the mesa-commit mailing list