Mesa (master): glsl: fix NULL check
Timothy Arceri
tarceri at kemper.freedesktop.org
Tue Nov 22 03:40:34 UTC 2016
Module: Mesa
Branch: master
Commit: 581bd1d12a0c8f68110519196673b11940887143
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=581bd1d12a0c8f68110519196673b11940887143
Author: Timothy Arceri <timothy.arceri at collabora.com>
Date: Tue Nov 22 13:19:33 2016 +1100
glsl: fix NULL check
Fixes copy and paste error in 9d96d3803ab
---
src/compiler/glsl/linker.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp
index 61a029c..845a793 100644
--- a/src/compiler/glsl/linker.cpp
+++ b/src/compiler/glsl/linker.cpp
@@ -2194,7 +2194,7 @@ link_intrastage_shaders(void *mem_ctx,
ctx->Driver.NewProgram(ctx,
_mesa_shader_stage_to_program(shader_list[0]->Stage),
prog->Name);
- if (!prog) {
+ if (!gl_prog) {
prog->data->LinkStatus = false;
_mesa_delete_linked_shader(ctx, linked);
return NULL;
More information about the mesa-commit
mailing list