From: Marek Olšák <marek.olsak@amd.com>
Date: Fri, 18 Aug 2023 16:05:58 +0000 (-0400)
Subject: radeonsi: fix templated si_draw_rectangle callback for Navi14
X-Git-Tag: upstream/23.3.3~3048
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff3db3e6cf864f04ea22547712548f28b14d9196;p=platform%2Fupstream%2Fmesa.git

radeonsi: fix templated si_draw_rectangle callback for Navi14

Navi14 is the only gfx10 chip that doesn't enable NGG.

Fixes: cd7e20f51388 ("radeonsi: specialize si_draw_rectangle using a C++ template")

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24759>
---

diff --git a/src/gallium/drivers/radeonsi/si_state_draw.cpp b/src/gallium/drivers/radeonsi/si_state_draw.cpp
index 3f9d1ef..656b658 100644
--- a/src/gallium/drivers/radeonsi/si_state_draw.cpp
+++ b/src/gallium/drivers/radeonsi/si_state_draw.cpp
@@ -2450,7 +2450,7 @@ static void si_init_draw_vbo_all_pipeline_options(struct si_context *sctx)
     */
    if (GFX_VERSION >= GFX11 && sctx->screen->info.has_set_pairs_packets)
       sctx->blitter->draw_rectangle = si_draw_rectangle<GFX_VERSION, NGG_ON, HAS_PAIRS_ON>;
-   else if (GFX_VERSION >= GFX10 && !(sctx->screen->debug_flags & DBG(NO_NGG)))
+   else if (GFX_VERSION >= GFX10 && sctx->screen->use_ngg)
       sctx->blitter->draw_rectangle = si_draw_rectangle<GFX_VERSION, NGG_ON, HAS_PAIRS_OFF>;
    else
       sctx->blitter->draw_rectangle = si_draw_rectangle<GFX_VERSION, NGG_OFF, HAS_PAIRS_OFF>;