OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/compiler: Remove redundant argument from brw_nir_create_passthrough_tcs

Browse Source 
Reviewed-by: Marcin Ślusarz <marcin.slusarz@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19831>
This commit is contained in:
Caio Oliveira
2022-11-17 14:49:56 -08:00
committed by Marge Bot
parent f0115ebc25
commit fbe40720e0
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/drivers/crocus/crocus_program.c
View File

@@ -1399,8 +1399,6 @@ crocus_compile_tcs(struct crocus_context *ice,
{ {
struct crocus_screen *screen = (struct crocus_screen *)ice->ctx.screen; struct crocus_screen *screen = (struct crocus_screen *)ice->ctx.screen;
const struct brw_compiler *compiler = screen->compiler; const struct brw_compiler *compiler = screen->compiler;
const struct nir_shader_compiler_options *options =
compiler->nir_options[MESA_SHADER_TESS_CTRL];
void *mem_ctx = ralloc_context(NULL); void *mem_ctx = ralloc_context(NULL);
struct brw_tcs_prog_data *tcs_prog_data = struct brw_tcs_prog_data *tcs_prog_data =
rzalloc(mem_ctx, struct brw_tcs_prog_data); rzalloc(mem_ctx, struct brw_tcs_prog_data);
@@ -1427,7 +1425,7 @@ crocus_compile_tcs(struct crocus_context *ice,
if (can_push_ubo(devinfo)) if (can_push_ubo(devinfo))
brw_nir_analyze_ubo_ranges(compiler, nir, NULL, prog_data->ubo_ranges); brw_nir_analyze_ubo_ranges(compiler, nir, NULL, prog_data->ubo_ranges);
} else { } else {
nir = brw_nir_create_passthrough_tcs(mem_ctx, compiler, options, key); nir = brw_nir_create_passthrough_tcs(mem_ctx, compiler, key);
/* Reserve space for passing the default tess levels as constants. */ /* Reserve space for passing the default tess levels as constants. */
num_cbufs = 1; num_cbufs = 1;

4
src/gallium/drivers/iris/iris_program.c
View File

@@ -1503,8 +1503,6 @@ iris_compile_tcs(struct iris_screen *screen,
struct iris_compiled_shader *shader) struct iris_compiled_shader *shader)
{ {
const struct brw_compiler *compiler = screen->compiler; const struct brw_compiler *compiler = screen->compiler;
const struct nir_shader_compiler_options *options =
compiler->nir_options[MESA_SHADER_TESS_CTRL];
void *mem_ctx = ralloc_context(NULL); void *mem_ctx = ralloc_context(NULL);
struct brw_tcs_prog_data *tcs_prog_data = struct brw_tcs_prog_data *tcs_prog_data =
rzalloc(mem_ctx, struct brw_tcs_prog_data); rzalloc(mem_ctx, struct brw_tcs_prog_data);
@@ -1532,7 +1530,7 @@ iris_compile_tcs(struct iris_screen *screen,
brw_nir_analyze_ubo_ranges(compiler, nir, NULL, prog_data->ubo_ranges); brw_nir_analyze_ubo_ranges(compiler, nir, NULL, prog_data->ubo_ranges);
} else { } else {
nir = nir =
brw_nir_create_passthrough_tcs(mem_ctx, compiler, options, &brw_key); brw_nir_create_passthrough_tcs(mem_ctx, compiler, &brw_key);
/* Reserve space for passing the default tess levels as constants. */ /* Reserve space for passing the default tess levels as constants. */
num_cbufs = 1; num_cbufs = 1;

3
src/intel/compiler/brw_nir.c
View File

@@ -1698,9 +1698,10 @@ brw_type_for_nir_type(const struct intel_device_info *devinfo,
nir_shader * nir_shader *
brw_nir_create_passthrough_tcs(void *mem_ctx, const struct brw_compiler *compiler, brw_nir_create_passthrough_tcs(void *mem_ctx, const struct brw_compiler *compiler,
const nir_shader_compiler_options *options,
const struct brw_tcs_prog_key *key) const struct brw_tcs_prog_key *key)
{ {
const nir_shader_compiler_options *options =
compiler->nir_options[MESA_SHADER_TESS_CTRL];
nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_TESS_CTRL, nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_TESS_CTRL,
options, "passthrough TCS"); options, "passthrough TCS");
ralloc_steal(mem_ctx, b.shader); ralloc_steal(mem_ctx, b.shader);

1
src/intel/compiler/brw_nir.h
View File

@@ -185,7 +185,6 @@ void brw_nir_optimize(nir_shader *nir,
nir_shader *brw_nir_create_passthrough_tcs(void *mem_ctx, nir_shader *brw_nir_create_passthrough_tcs(void *mem_ctx,
const struct brw_compiler *compiler, const struct brw_compiler *compiler,
const nir_shader_compiler_options *options,
const struct brw_tcs_prog_key *key); const struct brw_tcs_prog_key *key);
#define BRW_NIR_FRAG_OUTPUT_INDEX_SHIFT 0 #define BRW_NIR_FRAG_OUTPUT_INDEX_SHIFT 0