diff options
| author | Jason Ekstrand <[email protected]> | 2019-02-21 17:20:39 -0600 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2019-07-10 19:35:55 +0000 |
| commit | 14781e21227d036b8875bbdde9f343a8e73ceeb6 (patch) | |
| tree | f7691a6244aa1cf546d8b6282aa080b1a31e75c4 /src/intel/compiler/brw_vec4_tcs.cpp | |
| parent | 3a4667e502c458b6ac0ae3d4641612a9186a1924 (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_vec4_tcs.cpp')
| -rw-r--r-- | src/intel/compiler/brw_vec4_tcs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/intel/compiler/brw_vec4_tcs.cpp b/src/intel/compiler/brw_vec4_tcs.cpp index 39df2d5054b..b8f2a3bde0a 100644 --- a/src/intel/compiler/brw_vec4_tcs.cpp +++ b/src/intel/compiler/brw_vec4_tcs.cpp @@ -42,7 +42,7 @@ vec4_tcs_visitor::vec4_tcs_visitor(const struct brw_compiler *compiler, void *mem_ctx, int shader_time_index, const struct brw_vue_map *input_vue_map) - : vec4_visitor(compiler, log_data, &key->tex, &prog_data->base, + : vec4_visitor(compiler, log_data, &key->base.tex, &prog_data->base, nir, mem_ctx, false, shader_time_index), input_vue_map(input_vue_map), key(key) { @@ -397,7 +397,7 @@ brw_compile_tcs(const struct brw_compiler *compiler, nir->info.outputs_written, nir->info.patch_outputs_written); - 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_vue_inputs(nir, &input_vue_map); brw_nir_lower_tcs_outputs(nir, &vue_prog_data->vue_map, key->tes_primitive_mode); @@ -475,7 +475,7 @@ brw_compile_tcs(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_tcs()) { |