OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glsl/linker: Make get_main_function_signature public

Browse Source 
The next patch will use this function in a different file.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Ian Romanick
2014-06-19 12:05:20 -07:00
committed by Kenneth Graunke
parent 1e87fbd78f
commit 04d3323d4b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/glsl/linker.cpp
View File

@@ -1115,8 +1115,8 @@ move_non_declarations(exec_list *instructions, exec_node *last,
/** /**
* Get the function signature for main from a shader * Get the function signature for main from a shader
*/ */
static ir_function_signature * ir_function_signature *
get_main_function_signature(gl_shader *sh) link_get_main_function_signature(gl_shader *sh)
{ {
ir_function *const f = sh->symbols->get_function("main"); ir_function *const f = sh->symbols->get_function("main");
if (f != NULL) { if (f != NULL) {
@@ -1644,7 +1644,7 @@ link_intrastage_shaders(void *mem_ctx,
*/ */
gl_shader *main = NULL; gl_shader *main = NULL;
for (unsigned i = 0; i < num_shaders; i++) { for (unsigned i = 0; i < num_shaders; i++) {
if (get_main_function_signature(shader_list[i]) != NULL) { if (link_get_main_function_signature(shader_list[i]) != NULL) {
main = shader_list[i]; main = shader_list[i];
break; break;
} }
@@ -1673,7 +1673,8 @@ link_intrastage_shaders(void *mem_ctx,
/* The a pointer to the main function in the final linked shader (i.e., the /* The a pointer to the main function in the final linked shader (i.e., the
* copy of the original shader that contained the main function). * copy of the original shader that contained the main function).
*/ */
ir_function_signature *const main_sig = get_main_function_signature(linked); ir_function_signature *const main_sig =
link_get_main_function_signature(linked);
/* Move any instructions other than variable declarations or function /* Move any instructions other than variable declarations or function
* declarations into main. * declarations into main.

3
src/glsl/linker.h
View File

@@ -26,6 +26,9 @@
#ifndef GLSL_LINKER_H #ifndef GLSL_LINKER_H
#define GLSL_LINKER_H #define GLSL_LINKER_H
ir_function_signature *
link_get_main_function_signature(gl_shader *sh);
extern bool extern bool
link_function_calls(gl_shader_program *prog, gl_shader *main, link_function_calls(gl_shader_program *prog, gl_shader *main,
gl_shader **shader_list, unsigned num_shaders); gl_shader **shader_list, unsigned num_shaders);