Mesa (master): glsl: fix crash introduced by the previous commit

Marek Olšák mareko at kemper.freedesktop.org
Tue Oct 29 23:15:10 UTC 2013


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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Oct 30 00:11:57 2013 +0100

glsl: fix crash introduced by the previous commit

---

 src/glsl/opt_dead_builtin_varyings.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/opt_dead_builtin_varyings.cpp b/src/glsl/opt_dead_builtin_varyings.cpp
index 7099b9f..b336bc0 100644
--- a/src/glsl/opt_dead_builtin_varyings.cpp
+++ b/src/glsl/opt_dead_builtin_varyings.cpp
@@ -512,7 +512,7 @@ do_dead_builtin_varyings(struct gl_context *ctx,
                          tfeedback_decl *tfeedback_decls)
 {
    /* Lower the gl_FragData array to separate variables. */
-   if (consumer->Type == GL_FRAGMENT_SHADER) {
+   if (consumer && consumer->Type == GL_FRAGMENT_SHADER) {
       lower_fragdata_array(consumer->ir);
    }
 




More information about the mesa-commit mailing list