From b96639011c5a2fe8a37c7bddea25c08eb5ec67ba Mon Sep 17 00:00:00 2001
From: Faith Ekstrand <faith.ekstrand@collabora.com>
Date: Wed, 3 May 2023 18:13:55 -0500
Subject: [PATCH] nouveau/codegen: Don't convertSurfaceFormat for unknown
 formats

Without this and the previous patch, it would see PIPE_FORMAT_NONE as a
zero-component format and delete the whole load.

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24327>
---
 src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp b/src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
index e7b47a5..78fab61 100644
--- a/src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
+++ b/src/nouveau/codegen/nv50_ir_lowering_nvc0.cpp
@@ -2360,7 +2360,7 @@ NVC0LoweringPass::handleSurfaceOpNVE4(TexInstruction *su)
 {
    processSurfaceCoordsNVE4(su);
 
-   if (su->op == OP_SULDP) {
+   if (su->op == OP_SULDP && su->tex.format) {
       convertSurfaceFormat(su, NULL);
       insertOOBSurfaceOpResult(su);
    }
@@ -2561,7 +2561,7 @@ NVC0LoweringPass::handleSurfaceOpNVC0(TexInstruction *su)
 
    processSurfaceCoordsNVC0(su);
 
-   if (su->op == OP_SULDP) {
+   if (su->op == OP_SULDP && su->tex.format) {
       convertSurfaceFormat(su, NULL);
       insertOOBSurfaceOpResult(su);
    }
@@ -2767,7 +2767,7 @@ NVC0LoweringPass::handleSurfaceOpGM107(TexInstruction *su)
    Instruction *loaded[4] = {};
    TexInstruction *su2 = processSurfaceCoordsGM107(su, loaded);
 
-   if (su->op == OP_SULDP) {
+   if (su->op == OP_SULDP && su->tex.format) {
       convertSurfaceFormat(su, loaded);
    }
 
-- 
2.7.4