summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/glsl/linker.cpp2
-rw-r--r--src/mesa/main/mtypes.h7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index a53e91d2ef..11fccba378 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -823,8 +823,6 @@ link_shaders(struct gl_shader_program *prog)
goto done;
- prog->_LinkedShaders = (struct gl_shader **)
- calloc(2, sizeof(struct gl_shader *));
prog->_NumLinkedShaders = 0;
if (num_vert_shaders > 0) {
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index bc90b1e044..9a36740c41 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2006,8 +2006,13 @@ struct gl_shader_program
GLboolean _Used; /**< Ever used for drawing? */
GLchar *InfoLog;
+ /**
+ * Per-stage shaders resulting from the first stage of linking.
+ */
+ /*@{*/
GLuint _NumLinkedShaders;
- struct gl_shader **_LinkedShaders;
+ struct gl_shader *_LinkedShaders[2];
+ /*@}*/
};