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

r300: Remove the non_normalized_coords from the shader key.

Browse Source 
TexSrcTarget has to be RECT when this is set, anyway.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14117>
This commit is contained in:
Emma Anholt
2021-12-07 09:52:18 -08:00
committed by Marge Bot
parent 26b3e2f7cd
commit e9dd776ef9
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gallium/drivers/r300/compiler/radeon_code.h
View File

@@ -155,13 +155,6 @@ struct r300_fragment_program_external_state {
*/
unsigned compare_mode_enabled : 1;
/**
* If the sampler will receive non-normalized coords,
* this field is set. The scaling factor is given by
* RC_STATE_R300_TEXRECT_FACTOR.
*/
unsigned non_normalized_coords : 1;
/**
* This field specifies wrapping modes for the sampler.
*

3
src/gallium/drivers/r300/compiler/radeon_program_tex.c
View File

@@ -127,8 +127,7 @@ int radeonTransformTEX(
struct r300_fragment_program_compiler *compiler =
(struct r300_fragment_program_compiler*)data;
rc_wrap_mode wrapmode = compiler->state.unit[inst->U.I.TexSrcUnit].wrap_mode;
int is_rect = inst->U.I.TexSrcTarget == RC_TEXTURE_RECT ||
compiler->state.unit[inst->U.I.TexSrcUnit].non_normalized_coords;
int is_rect = inst->U.I.TexSrcTarget == RC_TEXTURE_RECT;
if (inst->U.I.Opcode != RC_OPCODE_TEX &&
inst->U.I.Opcode != RC_OPCODE_TXB &&

2
src/gallium/drivers/r300/r300_fs.c
View File

@@ -169,8 +169,6 @@ static void get_external_state(
state->unit[i].texture_compare_func = s->state.compare_func;
}
state->unit[i].non_normalized_coords = !s->state.normalized_coords;
/* Pass texture swizzling to the compiler, some lowering passes need it. */
if (state->unit[i].compare_mode_enabled) {
state->unit[i].texture_swizzle =