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

nir: rename nir_lower_tex_projector

Browse Source 
Since the following patches will add additional tex-lowering related
functionality, which doesn't make sense to split out into a separate
pass (as they would require duplication of the projector lowering
logic), let's give this pass a more generic name.

Signed-off-by: Rob Clark <robclark@freedesktop.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Rob Clark
2015-09-17 07:54:35 -04:00
parent 06d31dceae
commit d9b9ff76f1
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/glsl/Makefile.sources
View File

@@ -45,7 +45,7 @@ NIR_FILES = \
nir/nir_lower_phis_to_scalar.c \ nir/nir_lower_phis_to_scalar.c \
nir/nir_lower_samplers.cpp \ nir/nir_lower_samplers.cpp \
nir/nir_lower_system_values.c \ nir/nir_lower_system_values.c \
nir/nir_lower_tex_projector.c \ nir/nir_lower_tex.c \
nir/nir_lower_to_source_mods.c \ nir/nir_lower_to_source_mods.c \
nir/nir_lower_vars_to_ssa.c \ nir/nir_lower_vars_to_ssa.c \
nir/nir_lower_var_copies.c \ nir/nir_lower_var_copies.c \

2
src/glsl/nir/nir.h
View File

@@ -1836,7 +1836,7 @@ void nir_lower_samplers(nir_shader *shader,
const struct gl_shader_program *shader_program); const struct gl_shader_program *shader_program);
void nir_lower_system_values(nir_shader *shader); void nir_lower_system_values(nir_shader *shader);
void nir_lower_tex_projector(nir_shader *shader); void nir_lower_tex(nir_shader *shader);
void nir_lower_idiv(nir_shader *shader); void nir_lower_idiv(nir_shader *shader);
void nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables); void nir_lower_clip_vs(nir_shader *shader, unsigned ucp_enables);

10
src/glsl/nir/nir_lower_tex_projector.c → src/glsl/nir/nir_lower_tex.c
View File

@@ -31,7 +31,7 @@
#include "nir_builder.h" #include "nir_builder.h"
static bool static bool
nir_lower_tex_projector_block(nir_block *block, void *void_state) nir_lower_tex_block(nir_block *block, void *void_state)
{ {
nir_builder *b = void_state; nir_builder *b = void_state;
@@ -116,22 +116,22 @@ nir_lower_tex_projector_block(nir_block *block, void *void_state)
} }
static void static void
nir_lower_tex_projector_impl(nir_function_impl *impl) nir_lower_tex_impl(nir_function_impl *impl)
{ {
nir_builder b; nir_builder b;
nir_builder_init(&b, impl); nir_builder_init(&b, impl);
nir_foreach_block(impl, nir_lower_tex_projector_block, &b); nir_foreach_block(impl, nir_lower_tex_block, &b);
nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance); nir_metadata_dominance);
} }
void void
nir_lower_tex_projector(nir_shader *shader) nir_lower_tex(nir_shader *shader)
{ {
nir_foreach_overload(shader, overload) { nir_foreach_overload(shader, overload) {
if (overload->impl) if (overload->impl)
nir_lower_tex_projector_impl(overload->impl); nir_lower_tex_impl(overload->impl);
} }
} }

2
src/mesa/drivers/dri/i965/brw_nir.c
View File

@@ -96,7 +96,7 @@ brw_create_nir(struct brw_context *brw,
nir_lower_global_vars_to_local(nir); nir_lower_global_vars_to_local(nir);
nir_validate_shader(nir); nir_validate_shader(nir);
nir_lower_tex_projector(nir); nir_lower_tex(nir);
nir_validate_shader(nir); nir_validate_shader(nir);
nir_normalize_cubemap_coords(nir); nir_normalize_cubemap_coords(nir);