diff options
| author | Timothy Arceri <timothy.arceri@collabora.com> | 2016-06-27 16:25:00 +1000 |
|---|---|---|
| committer | Timothy Arceri <timothy.arceri@collabora.com> | 2016-06-30 16:51:25 +1000 |
| commit | 47f83817303e0f24f2d410450f897945a5746ef2 (patch) | |
| tree | e8dd06b8d0574f5c8851d470dab44929a69607f1 /src/compiler/glsl/linker.cpp | |
| parent | 9e9d01cbe802df386586db3fde1a531151b6d66a (diff) | |
| download | external_mesa3d-47f83817303e0f24f2d410450f897945a5746ef2.zip external_mesa3d-47f83817303e0f24f2d410450f897945a5746ef2.tar.gz external_mesa3d-47f83817303e0f24f2d410450f897945a5746ef2.tar.bz2 | |
glsl: pass symbols rather than shader to _mesa_get_main_function_signature()
This will allow us to split gl_shader into two different structs, one for
shader objects and one for linked shaders.
Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Diffstat (limited to 'src/compiler/glsl/linker.cpp')
| -rw-r--r-- | src/compiler/glsl/linker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/glsl/linker.cpp b/src/compiler/glsl/linker.cpp index 90d7831..411d2fe 100644 --- a/src/compiler/glsl/linker.cpp +++ b/src/compiler/glsl/linker.cpp @@ -2216,7 +2216,7 @@ link_intrastage_shaders(void *mem_ctx, */ gl_shader *main = NULL; for (unsigned i = 0; i < num_shaders; i++) { - if (_mesa_get_main_function_signature(shader_list[i]) != NULL) { + if (!_mesa_get_main_function_signature(shader_list[i]->symbols)) { main = shader_list[i]; break; } @@ -2246,7 +2246,7 @@ link_intrastage_shaders(void *mem_ctx, * copy of the original shader that contained the main function). */ ir_function_signature *const main_sig = - _mesa_get_main_function_signature(linked); + _mesa_get_main_function_signature(linked->symbols); /* Move any instructions other than variable declarations or function * declarations into main. |