diff options
| author | Timothy Arceri <[email protected]> | 2016-06-30 14:55:40 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2016-06-30 16:51:25 +1000 |
| commit | 1fb8c6df884c2a17cf980c4ea32db4c214903b55 (patch) | |
| tree | a21b0de699816ce28de37dd61531a025cc984114 /src/mesa/drivers/dri/i965/brw_program.c | |
| parent | 378f07ccb5bff7857d87a4fe5dff0b5e83f99895 (diff) | |
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]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_program.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index a1a81165ab1..aee9467ddb7 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -651,7 +651,7 @@ brw_stage_prog_data_free(const void *p) void brw_dump_ir(const char *stage, struct gl_shader_program *shader_prog, - struct gl_shader *shader, struct gl_program *prog) + struct gl_linked_shader *shader, struct gl_program *prog) { if (shader_prog) { if (shader->ir) { |