linker: Don't dynamically allocate slots for linked shaders

The can be at most one shader per stage.  There are currently only two
stages.  There is zero reason to dynamically size this array.

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index a53e91d2eff8e52b8b1acf6284bebd2c09538e18..11fccba378676c8bcda430a8fac6ef1888954805 100644 (file)
--- 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 bc90b1e0441b4b3e440017f8fa145cc23342c1e3..9a36740c415b62ec8ee4676c842e2bc6dd849ff6 100644 (file)
--- 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];
+   /*@}*/
 };