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

mesa/st: return progress in st_nir_lower_wpos_ytransform

Browse Source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26976>
This commit is contained in:
Alyssa Rosenzweig
2024-01-10 09:59:51 -04:00
committed by Marge Bot
parent 1452b22ef9
commit f81afb4b06
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/state_tracker/st_glsl_to_nir.cpp
View File

@@ -441,13 +441,17 @@ st_nir_vectorize_io(nir_shader *producer, nir_shader *consumer)
extern "C" {
void
bool
st_nir_lower_wpos_ytransform(struct nir_shader *nir,
struct gl_program *prog,
struct pipe_screen *pscreen)
{
if (nir->info.stage != MESA_SHADER_FRAGMENT)
return;
bool progress = false;
if (nir->info.stage != MESA_SHADER_FRAGMENT) {
nir_shader_preserve_all_metadata(nir);
return progress;
}
static const gl_state_index16 wposTransformState[STATE_LENGTH] = {
STATE_FB_WPOS_Y_TRANSFORM
@@ -470,8 +474,8 @@ st_nir_lower_wpos_ytransform(struct nir_shader *nir,
PIPE_CAP_FS_COORD_PIXEL_CENTER_HALF_INTEGER);
if (nir_lower_wpos_ytransform(nir, &wpos_options)) {
nir_validate_shader(nir, "after nir_lower_wpos_ytransform");
_mesa_add_state_reference(prog->Parameters, wposTransformState);
progress = true;
}
static const gl_state_index16 pntcTransformState[STATE_LENGTH] = {
@@ -480,7 +484,10 @@ st_nir_lower_wpos_ytransform(struct nir_shader *nir,
if (nir_lower_pntc_ytransform(nir, &pntcTransformState)) {
_mesa_add_state_reference(prog->Parameters, pntcTransformState);
progress = true;
}
return progress;
}
static bool

2
src/mesa/state_tracker/st_nir.h
View File

@@ -39,7 +39,7 @@ void st_nir_lower_builtin(struct nir_shader *shader);
void st_nir_lower_tex_src_plane(struct nir_shader *shader, unsigned free_slots,
unsigned lower_2plane, unsigned lower_3plane);
void st_nir_lower_wpos_ytransform(struct nir_shader *nir,
bool st_nir_lower_wpos_ytransform(struct nir_shader *nir,
struct gl_program *prog,
struct pipe_screen *pscreen);