aboutsummaryrefslogtreecommitdiffstats
path: root/src/intel/compiler/brw_shader.cpp
diff options
context:
space:
mode:
authorJason Ekstrand <[email protected]>2019-02-21 17:20:39 -0600
committerJason Ekstrand <[email protected]>2019-07-10 19:35:55 +0000
commit14781e21227d036b8875bbdde9f343a8e73ceeb6 (patch)
treef7691a6244aa1cf546d8b6282aa080b1a31e75c4 /src/intel/compiler/brw_shader.cpp
parent3a4667e502c458b6ac0ae3d4641612a9186a1924 (diff)
intel/compiler: Add a "base class" for program keys
Right now, all keys have two things in common: a program string ID and a sampler_prog_key_data. I'd like to add another thing or two and need a place to put it. This commit adds a new brw_base_prog_key struct which contains those two common bits. Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/intel/compiler/brw_shader.cpp')
-rw-r--r--src/intel/compiler/brw_shader.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/intel/compiler/brw_shader.cpp b/src/intel/compiler/brw_shader.cpp
index 643765c1b22..8403f19b831 100644
--- a/src/intel/compiler/brw_shader.cpp
+++ b/src/intel/compiler/brw_shader.cpp
@@ -1244,7 +1244,7 @@ brw_compile_tes(const struct brw_compiler *compiler,
nir->info.inputs_read = key->inputs_read;
nir->info.patch_inputs_read = key->patch_inputs_read;
- brw_nir_apply_sampler_key(nir, compiler, &key->tex, is_scalar);
+ brw_nir_apply_sampler_key(nir, compiler, &key->base.tex, is_scalar);
brw_nir_lower_tes_inputs(nir, input_vue_map);
brw_nir_lower_vue_outputs(nir);
brw_postprocess_nir(nir, compiler, is_scalar);
@@ -1322,7 +1322,7 @@ brw_compile_tes(const struct brw_compiler *compiler,
}
if (is_scalar) {
- fs_visitor v(compiler, log_data, mem_ctx, (void *) key,
+ fs_visitor v(compiler, log_data, mem_ctx, &key->base,
&prog_data->base.base, NULL, nir, 8,
shader_time_index, input_vue_map);
if (!v.run_tes()) {