glsl/mesa: split gl_shader in two

There are two distinctly different uses of this struct. The first
is to store GL shader objects. The second is to store information
about a shader stage thats been linked.

The two uses actually share few fields and there is clearly confusion
about their use. For example the linked shaders map one to one with
a program so can simply be destroyed along with the program. However
previously we were calling reference counting on the linked shaders.

We were also creating linked shaders with a name even though it
is always 0 and called the driver version of the _mesa_new_shader()
function unnecessarily for GL shader objects.

Acked-by: Iago Toral Quiroga <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/compiler/glsl/link_functions.cpp b/src/compiler/glsl/link_functions.cpp
index de194c32451..079f3b959ef 100644
--- a/src/compiler/glsl/link_functions.cpp
+++ b/src/compiler/glsl/link_functions.cpp
@@ -37,7 +37,7 @@ namespace {
 
 class call_link_visitor : public ir_hierarchical_visitor {
 public:
-   call_link_visitor(gl_shader_program *prog, gl_shader *linked,
+   call_link_visitor(gl_shader_program *prog, gl_linked_shader *linked,
 		     gl_shader **shader_list, unsigned num_shaders)
    {
       this->prog = prog;
@@ -297,7 +297,7 @@ private:
     * linked shader that are accessed by the function.  It is also used to add
     * global variables from the shader where the function originated.
     */
-   gl_shader *linked;
+   gl_linked_shader *linked;
 
    /**
     * Table of variables local to the function.
@@ -335,7 +335,7 @@ find_matching_signature(const char *name, const exec_list *actual_parameters,
 
 
 bool
-link_function_calls(gl_shader_program *prog, gl_shader *main,
+link_function_calls(gl_shader_program *prog, gl_linked_shader *main,
 		    gl_shader **shader_list, unsigned num_shaders)
 {
    call_link_visitor v(prog, main, shader_list, num_shaders);