diff options
| author | Eric Anholt <[email protected]> | 2019-04-29 15:38:24 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2019-05-13 12:03:08 -0700 |
| commit | 0c31fe9ee743f699bcabcb638ccc83e515f0d1bd (patch) | |
| tree | 7a8e3fba596796d27e75bc40ba110c24a13c0dec /src/gallium/drivers/swr/swr_screen.cpp | |
| parent | f33cb272f0890f115c36fb96173123bc699b7b2c (diff) | |
gallium: Redefine the max texture 2d cap from _LEVELS to _SIZE.
The _LEVELS assumes that the max is always power of two. For V3D 4.2, we
can support up to 7680 non-power-of-two MSAA textures, which will let X11
support dual 4k displays on newer hardware.
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr/swr_screen.cpp')
| -rw-r--r-- | src/gallium/drivers/swr/swr_screen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp index 3a2a6133127..0b1347793f5 100644 --- a/src/gallium/drivers/swr/swr_screen.cpp +++ b/src/gallium/drivers/swr/swr_screen.cpp @@ -52,7 +52,7 @@ * XXX Check max texture size values against core and sampler. */ #define SWR_MAX_TEXTURE_SIZE (2 * 1024 * 1024 * 1024ULL) /* 2GB */ -#define SWR_MAX_TEXTURE_2D_LEVELS 14 /* 8K x 8K for now */ +#define SWR_MAX_TEXTURE_2D_SIZE 8192 #define SWR_MAX_TEXTURE_3D_LEVELS 12 /* 2K x 2K x 2K for now */ #define SWR_MAX_TEXTURE_CUBE_LEVELS 14 /* 8K x 8K for now */ #define SWR_MAX_TEXTURE_ARRAY_LAYERS 512 /* 8K x 512 / 8K x 8K x 512 */ @@ -162,8 +162,8 @@ swr_get_param(struct pipe_screen *screen, enum pipe_cap param) /* limits */ case PIPE_CAP_MAX_RENDER_TARGETS: return PIPE_MAX_COLOR_BUFS; - case PIPE_CAP_MAX_TEXTURE_2D_LEVELS: - return SWR_MAX_TEXTURE_2D_LEVELS; + case PIPE_CAP_MAX_TEXTURE_2D_SIZE: + return SWR_MAX_TEXTURE_2D_SIZE; case PIPE_CAP_MAX_TEXTURE_3D_LEVELS: return SWR_MAX_TEXTURE_3D_LEVELS; case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS: |