Mesa (staging/22.1): drisw: remove dead code

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Apr 27 19:30:40 UTC 2022


Module: Mesa
Branch: staging/22.1
Commit: 7fb345d84a2d818da0618bd843517f4f3db7f4d7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7fb345d84a2d818da0618bd843517f4f3db7f4d7

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Apr 25 10:00:08 2022 -0400

drisw: remove dead code

this was from a very early version of kopper, but it can no longer
be reached

Fixes: d760a9151b7 ("gallium: Learn about kopper")

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16152>
(cherry picked from commit 6a9def8c9f8ff7b6131fb5c78c303d5b1376542a)

---

 .pick_status.json                 | 2 +-
 src/gallium/frontends/dri/drisw.c | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 5ce95d492b3..ec16b277e8a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -427,7 +427,7 @@
         "description": "drisw: remove dead code",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d760a9151b73d1998fceff38fb1c642e4d77bf67"
     },
diff --git a/src/gallium/frontends/dri/drisw.c b/src/gallium/frontends/dri/drisw.c
index 5603b612318..fa6769d3b57 100644
--- a/src/gallium/frontends/dri/drisw.c
+++ b/src/gallium/frontends/dri/drisw.c
@@ -397,13 +397,7 @@ drisw_allocate_textures(struct dri_context *stctx,
       templ.nr_samples = 0;
       templ.nr_storage_samples = 0;
 
-      if (bind & PIPE_BIND_DISPLAY_TARGET &&
-          screen->base.screen->resource_create_drawable) {
-         drawable->textures[statts[i]] =
-            screen->base.screen->resource_create_drawable(screen->base.screen,
-                                                          &templ,
-                                                          drawable->dPriv);
-      } else if (statts[i] == ST_ATTACHMENT_FRONT_LEFT &&
+      if (statts[i] == ST_ATTACHMENT_FRONT_LEFT &&
                  screen->base.screen->resource_create_front &&
                  loader->base.version >= 3) {
          drawable->textures[statts[i]] =



More information about the mesa-commit mailing list