Mesa (master): wgl: drop unused member

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Apr 2 10:09:58 UTC 2020


Module: Mesa
Branch: master
Commit: 098d4cf25f34183f35482ee40d4ef2c4e810269d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=098d4cf25f34183f35482ee40d4ef2c4e810269d

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Sun May 26 10:42:39 2019 +0200

wgl: drop unused member

While we're at it, drop trying to re-calculate the max-size from the
max-level. It's not accurate on any drivers where the max-size isn't a
power of two anyway.

Reviewed-by: Neha Bhende <bhenden at vmware.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4307>

---

 src/gallium/state_trackers/wgl/stw_device.c | 5 ++---
 src/gallium/state_trackers/wgl/stw_device.h | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/gallium/state_trackers/wgl/stw_device.c b/src/gallium/state_trackers/wgl/stw_device.c
index 0636cfcd2cf..7c887194b5c 100644
--- a/src/gallium/state_trackers/wgl/stw_device.c
+++ b/src/gallium/state_trackers/wgl/stw_device.c
@@ -118,9 +118,8 @@ stw_init(const struct stw_winsys *stw_winsys)
    stw_dev->smapi->get_param = stw_get_param;
    stw_dev->screen = screen;
 
-   stw_dev->max_2d_levels = util_last_bit(screen->get_param(screen,
-                                                            PIPE_CAP_MAX_TEXTURE_2D_SIZE));
-   stw_dev->max_2d_length = 1 << (stw_dev->max_2d_levels - 1);
+   stw_dev->max_2d_length = screen->get_param(screen,
+                                              PIPE_CAP_MAX_TEXTURE_2D_SIZE);
 
    InitializeCriticalSection(&stw_dev->ctx_mutex);
    InitializeCriticalSection(&stw_dev->fb_mutex);
diff --git a/src/gallium/state_trackers/wgl/stw_device.h b/src/gallium/state_trackers/wgl/stw_device.h
index 9f6995f5bef..3e1ffebe708 100644
--- a/src/gallium/state_trackers/wgl/stw_device.h
+++ b/src/gallium/state_trackers/wgl/stw_device.h
@@ -51,7 +51,6 @@ struct stw_device
    struct pipe_screen *screen;
    
    /* Cache some PIPE_CAP_* */
-   unsigned max_2d_levels;
    unsigned max_2d_length;
 
    struct st_api *stapi;



More information about the mesa-commit mailing list