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

glsl: inline do_common_optimization() call

Browse Source 
The function was previously a helper for when some drivers still
called the GLSL IR optimisations in a loop. No drivers do that
anymore.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16924>
This commit is contained in:
Timothy Arceri
2022-06-08 14:54:46 +10:00
committed by Marge Bot
parent d09a37ef54
commit 893b4d98f8
1 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler/glsl/linker.cpp
View File

@@ -3561,15 +3561,6 @@ link_varyings(const struct gl_constants *consts, struct gl_shader_program *prog,
return true; return true;
} }
static void
linker_optimisation_loop(const struct gl_constants *consts, exec_list *ir,
unsigned stage)
{
/* Run it just once, since NIR will do the real optimizaiton. */
do_common_optimization(ir, true, &consts->ShaderCompilerOptions[stage],
consts->NativeIntegers);
}
void void
link_shaders(struct gl_context *ctx, struct gl_shader_program *prog) link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
{ {
@@ -3907,10 +3898,10 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
} }
} }
/* Call opts before lowering const arrays to uniforms so we can const /* Run it just once, since NIR will do the real optimizaiton. */
* propagate any elements accessed directly. do_common_optimization(prog->_LinkedShaders[i]->ir, true,
*/ &consts->ShaderCompilerOptions[i],
linker_optimisation_loop(consts, prog->_LinkedShaders[i]->ir, i); consts->NativeIntegers);
} }
/* Check and validate stream emissions in geometry shaders */ /* Check and validate stream emissions in geometry shaders */