diff options
| author | Kenneth Graunke <[email protected]> | 2019-05-21 16:10:21 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2019-05-21 16:58:54 -0700 |
| commit | 6dc1c2d8bdbcb75795e73ee08e56a2d9c4a6b784 (patch) | |
| tree | 0f441ba227e5dfd9876069e61e73769bb5864a3f | |
| parent | d6053bf2a170a0fec6d232fda097d2f35f0e9eae (diff) | |
iris: Fix ALT mode regressions from shader cache
We were checking this based on nir->info.name, but with the shader
cache enabled, nir_strip throws out the name, causing us to use IEEE
mode for ARB programs.
gl-1.0-spot-light regressed because it wants ALT mode for 0^0 behavior.
Fixes: dc5dc727d59 iris: Serialize the NIR to a blob we can use for shader cache purposes.
| -rw-r--r-- | src/gallium/drivers/iris/iris_context.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/iris/iris_program.c | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/gallium/drivers/iris/iris_context.h b/src/gallium/drivers/iris/iris_context.h index add6a9a9e34..75e13778631 100644 --- a/src/gallium/drivers/iris/iris_context.h +++ b/src/gallium/drivers/iris/iris_context.h @@ -271,6 +271,9 @@ struct iris_uncompiled_shader { /** Have any shader variants been compiled yet? */ bool compiled_once; + + /** Should we use ALT mode for math? Useful for ARB programs. */ + bool use_alt_mode; }; /** diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index 21651bfd2c9..a5cd987664f 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -543,8 +543,7 @@ iris_compile_vs(struct iris_context *ice, nir_shader_gather_info(nir, impl); } - if (nir->info.name && strncmp(nir->info.name, "ARB", 3) == 0) - prog_data->use_alt_mode = true; + prog_data->use_alt_mode = ish->use_alt_mode; iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values, &num_system_values, &num_cbufs); @@ -1061,8 +1060,7 @@ iris_compile_fs(struct iris_context *ice, nir_shader *nir = nir_shader_clone(mem_ctx, ish->nir); - if (nir->info.name && strncmp(nir->info.name, "ARB", 3) == 0) - prog_data->use_alt_mode = true; + prog_data->use_alt_mode = ish->use_alt_mode; iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values, &num_system_values, &num_cbufs); @@ -1490,6 +1488,10 @@ iris_create_uncompiled_shader(struct pipe_context *ctx, update_so_info(&ish->stream_output, nir->info.outputs_written); } + /* Save this now before potentially dropping nir->info.name */ + if (nir->info.name && strncmp(nir->info.name, "ARB", 3) == 0) + ish->use_alt_mode = true; + if (screen->disk_cache) { /* Serialize the NIR to a binary blob that we can hash for the disk * cache. First, drop unnecessary information (like variable names) |