diff options
author | Timothy Arceri <[email protected]> | 2019-02-20 17:13:49 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2019-03-06 23:05:20 +0000 |
commit | 7e60d5a501f311fa5e7bca5335adc6013dc1aeb9 (patch) | |
tree | 9dac6cae42a538fd3d904920e11058d8a1c8ba8c /src/gallium/drivers/panfrost | |
parent | 7530d4abfcf9d39fb1b4abeb77cdbf6cf1d411a7 (diff) |
glsl: use NIR function inlining for drivers that use glsl_to_nir()
glsl_to_nir() is still missing support for converting certain
functions to NIR, so for those we use the GLSL IR optimisations
to remove the functions.
Reviewed-by: Eric Anholt <[email protected]>
Diffstat (limited to 'src/gallium/drivers/panfrost')
-rw-r--r-- | src/gallium/drivers/panfrost/midgard/cmdline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/panfrost/midgard/cmdline.c b/src/gallium/drivers/panfrost/midgard/cmdline.c index 7326402dd09..acd810b2f34 100644 --- a/src/gallium/drivers/panfrost/midgard/cmdline.c +++ b/src/gallium/drivers/panfrost/midgard/cmdline.c @@ -66,11 +66,11 @@ compile_shader(char **argv) } midgard_program compiled; - nir = glsl_to_nir(prog, MESA_SHADER_VERTEX, &midgard_nir_options); + nir = glsl_to_nir(&local_ctx, prog, MESA_SHADER_VERTEX, &midgard_nir_options); midgard_compile_shader_nir(nir, &compiled, false); finalise_to_disk("vertex.bin", &compiled.compiled); - nir = glsl_to_nir(prog, MESA_SHADER_FRAGMENT, &midgard_nir_options); + nir = glsl_to_nir(&local_ctx, prog, MESA_SHADER_FRAGMENT, &midgard_nir_options); midgard_compile_shader_nir(nir, &compiled, false); finalise_to_disk("fragment.bin", &compiled.compiled); } @@ -91,7 +91,7 @@ compile_blend(char **argv) prog->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program->info.stage = MESA_SHADER_FRAGMENT; midgard_program program; - nir = glsl_to_nir(prog, MESA_SHADER_FRAGMENT, &midgard_nir_options); + nir = glsl_to_nir(&local_ctx, prog, MESA_SHADER_FRAGMENT, &midgard_nir_options); midgard_compile_shader_nir(nir, &program, true); finalise_to_disk("blend.bin", &program.compiled); } |