AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tgsi_to_nir: use pipe_screen::finalize_nir

Browse Source 
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Marek Olšák
2019-09-27 14:55:58 -04:00
parent fb04e5da97
commit 43efccb657
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/auxiliary/nir/tgsi_to_nir.c
+9 -4
View File
@@ -2626,7 +2626,7 @@ ttn_optimize_nir(nir_shader *nir)
* so we have to do it here too.
*/
static void
ttn_finalize_nir(struct ttn_compile *c)
ttn_finalize_nir(struct ttn_compile *c, struct pipe_screen *screen)
{
struct nir_shader *nir = c->build.shader;
@@ -2644,8 +2644,13 @@ ttn_finalize_nir(struct ttn_compile *c)
if (!c->cap_samplers_as_deref)
NIR_PASS_V(nir, nir_lower_samplers);
ttn_optimize_nir(nir);
nir_shader_gather_info(nir, c->build.impl);
if (screen->finalize_nir) {
screen->finalize_nir(screen, nir, true);
} else {
ttn_optimize_nir(nir);
nir_shader_gather_info(nir, c->build.impl);
}
nir_validate_shader(nir, "TTN: after all optimizations");
}
@@ -2658,7 +2663,7 @@ tgsi_to_nir(const void *tgsi_tokens,
c = ttn_compile_init(tgsi_tokens, NULL, screen);
s = c->build.shader;
ttn_finalize_nir(c);
ttn_finalize_nir(c, screen);
ralloc_free(c);
return s;