From 51dfde7b96e6dbf3789e8621b51bdd86fa828edd Mon Sep 17 00:00:00 2001
From: M Henning <drawoc@darkrefraction.com>
Date: Sun, 16 Jul 2023 21:52:57 -0400
Subject: [PATCH] nouveau: Drop ConverterCommon::Subroutine

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24175>
---
 src/nouveau/codegen/nv50_ir_from_common.cpp | 24 ---------------------
 src/nouveau/codegen/nv50_ir_from_common.h   | 15 -------------
 2 files changed, 39 deletions(-)

diff --git a/src/nouveau/codegen/nv50_ir_from_common.cpp b/src/nouveau/codegen/nv50_ir_from_common.cpp
index 70bcd4231a7..3156eeeca8c 100644
--- a/src/nouveau/codegen/nv50_ir_from_common.cpp
+++ b/src/nouveau/codegen/nv50_ir_from_common.cpp
@@ -30,30 +30,6 @@ ConverterCommon::ConverterCommon(Program *prog, nv50_ir_prog_info *info,
       info(info),
       info_out(info_out) {}
 
-ConverterCommon::Subroutine *
-ConverterCommon::getSubroutine(unsigned ip)
-{
-   std::map<unsigned, Subroutine>::iterator it = sub.map.find(ip);
-
-   if (it == sub.map.end())
-      it = sub.map.insert(std::make_pair(
-              ip, Subroutine(new Function(prog, "SUB", ip)))).first;
-
-   return &it->second;
-}
-
-ConverterCommon::Subroutine *
-ConverterCommon::getSubroutine(Function *f)
-{
-   unsigned ip = f->getLabel();
-   std::map<unsigned, Subroutine>::iterator it = sub.map.find(ip);
-
-   if (it == sub.map.end())
-      it = sub.map.insert(std::make_pair(ip, Subroutine(f))).first;
-
-   return &it->second;
-}
-
 uint8_t
 ConverterCommon::translateInterpMode(const struct nv50_ir_varying *var, operation& op)
 {
diff --git a/src/nouveau/codegen/nv50_ir_from_common.h b/src/nouveau/codegen/nv50_ir_from_common.h
index 3da3595b689..03177ac1f7b 100644
--- a/src/nouveau/codegen/nv50_ir_from_common.h
+++ b/src/nouveau/codegen/nv50_ir_from_common.h
@@ -30,25 +30,10 @@ class ConverterCommon : public BuildUtil
 public:
    ConverterCommon(Program *, nv50_ir_prog_info *, nv50_ir_prog_info_out *);
 protected:
-   struct Subroutine
-   {
-      Subroutine(Function *f) : f(f) { }
-      Function *f;
-      ValueMap values;
-   };
-
-   Subroutine *getSubroutine(unsigned ip);
-   Subroutine *getSubroutine(Function *);
-
    uint8_t translateInterpMode(const struct nv50_ir_varying *var, operation& op);
 
    void handleUserClipPlanes();
 
-   struct {
-      std::map<unsigned, Subroutine> map;
-      Subroutine *cur;
-   } sub;
-
    struct nv50_ir_prog_info *info;
    struct nv50_ir_prog_info_out *info_out;
    Value *fragCoord[4];