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

r300: Replace RADEON_NO_TCL with RADEON_DEBUG=notcl

Browse Source 
The old option was broken with shader cache.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Signed-off-by: Pavel Ondračka <pavel.ondracka@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14333>
This commit is contained in:
Pavel Ondračka
2021-12-29 11:07:17 +01:00
committed by Marge Bot
parent 44f134bc21
commit 6f7421f50d
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/envvars.rst
View File

@@ -393,12 +393,6 @@ Intel driver environment variables
assembly. assembly.
Radeon driver environment variables (radeon, r200, and r300g)
-------------------------------------------------------------
:envvar:`RADEON_NO_TCL`
if set, disable hardware-accelerated Transform/Clip/Lighting.
DRI environment variables DRI environment variables
------------------------- -------------------------
@@ -1026,6 +1020,8 @@ r300 driver environment variables
Disable AA compression and fast AA clear Disable AA compression and fast AA clear
``use_tgsi`` ``use_tgsi``
Request TGSI shaders from the state tracker Request TGSI shaders from the state tracker
``notcl``
Disable hardware accelerated Transform/Clip/Lighting
Other Gallium drivers have their own environment variables. These may Other Gallium drivers have their own environment variables. These may
change frequently so the source code should be consulted for details. change frequently so the source code should be consulted for details.

4
src/gallium/drivers/r300/r300_chipset.c
View File

@@ -175,9 +175,5 @@ void r300_parse_chipset(uint32_t pci_id, struct r300_capabilities* caps)
caps->has_us_format = caps->family == CHIP_R520; caps->has_us_format = caps->family == CHIP_R520;
caps->has_tcl = caps->num_vert_fpus > 0; caps->has_tcl = caps->num_vert_fpus > 0;
if (caps->has_tcl) {
caps->has_tcl = debug_get_bool_option("RADEON_NO_TCL", FALSE) ? FALSE : TRUE;
}
r300_apply_hyperz_blacklist(caps); r300_apply_hyperz_blacklist(caps);
} }

1
src/gallium/drivers/r300/r300_debug.c
View File

@@ -51,6 +51,7 @@ static const struct debug_named_value r300_debug_options[] = {
{ "nohiz", DBG_NO_HIZ, "Disable hierarchical zbuffer" }, { "nohiz", DBG_NO_HIZ, "Disable hierarchical zbuffer" },
{ "nocmask", DBG_NO_CMASK, "Disable AA compression and fast AA clear" }, { "nocmask", DBG_NO_CMASK, "Disable AA compression and fast AA clear" },
{ "use_tgsi", DBG_USE_TGSI, "Request TGSI shaders from the state tracker" }, { "use_tgsi", DBG_USE_TGSI, "Request TGSI shaders from the state tracker" },
{ "notcl", DBG_NO_TCL, "Disable hardware accelerated Transform/Clip/Lighting" },
/* must be last */ /* must be last */
DEBUG_NAMED_VALUE_END DEBUG_NAMED_VALUE_END

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

@@ -851,6 +851,8 @@ struct pipe_screen* r300_screen_create(struct radeon_winsys *rws,
r300screen->caps.zmask_ram = 0; r300screen->caps.zmask_ram = 0;
if (SCREEN_DBG_ON(r300screen, DBG_NO_HIZ)) if (SCREEN_DBG_ON(r300screen, DBG_NO_HIZ))
r300screen->caps.hiz_ram = 0; r300screen->caps.hiz_ram = 0;
if (SCREEN_DBG_ON(r300screen, DBG_NO_TCL))
r300screen->caps.has_tcl = FALSE;
r300screen->rws = rws; r300screen->rws = rws;
r300screen->screen.destroy = r300_destroy_screen; r300screen->screen.destroy = r300_destroy_screen;

1
src/gallium/drivers/r300/r300_screen.h
View File

@@ -104,6 +104,7 @@ radeon_winsys(struct pipe_screen *screen) {
#define DBG_NO_HIZ (1 << 22) #define DBG_NO_HIZ (1 << 22)
#define DBG_NO_CMASK (1 << 23) #define DBG_NO_CMASK (1 << 23)
#define DBG_USE_TGSI (1 << 24) #define DBG_USE_TGSI (1 << 24)
#define DBG_NO_TCL (1 << 25)
/*@}*/ /*@}*/
static inline boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags) static inline boolean SCREEN_DBG_ON(struct r300_screen * screen, unsigned flags)
{ {