summaryrefslogtreecommitdiffstats
path: root/src/compiler/glsl/test_optpass.cpp
diff options
context:
space:
mode:
authorTimothy Arceri <timothy.arceri@collabora.com>2016-06-30 14:55:40 +1000
committerTimothy Arceri <timothy.arceri@collabora.com>2016-06-30 16:51:25 +1000
commit1fb8c6df884c2a17cf980c4ea32db4c214903b55 (patch)
treea21b0de699816ce28de37dd61531a025cc984114 /src/compiler/glsl/test_optpass.cpp
parent378f07ccb5bff7857d87a4fe5dff0b5e83f99895 (diff)
downloadexternal_mesa3d-1fb8c6df884c2a17cf980c4ea32db4c214903b55.zip
external_mesa3d-1fb8c6df884c2a17cf980c4ea32db4c214903b55.tar.gz
external_mesa3d-1fb8c6df884c2a17cf980c4ea32db4c214903b55.tar.bz2
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 <itoral@igalia.com>
Diffstat (limited to 'src/compiler/glsl/test_optpass.cpp')
-rw-r--r--src/compiler/glsl/test_optpass.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/test_optpass.cpp b/src/compiler/glsl/test_optpass.cpp
index fed1fab..f19d7e6 100644
--- a/src/compiler/glsl/test_optpass.cpp
+++ b/src/compiler/glsl/test_optpass.cpp
@@ -200,7 +200,7 @@ int test_optpass(int argc, char **argv)
struct gl_context *ctx = &local_ctx;
initialize_context_to_defaults(ctx, API_OPENGL_COMPAT);
- ctx->Driver.NewShader = _mesa_new_shader;
+ ctx->Driver.NewShader = _mesa_new_linked_shader;
ir_variable::temporaries_allocate_names = true;
struct gl_shader *shader = rzalloc(NULL, struct gl_shader);