fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 21:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swr: fixes for format mapping and texture sizing

Browse source 
Signed-off-by: Tim Rowley <timothy.o.rowley@intel.com>
This commit is contained in:
Tim Rowley 2016-08-17 10:12:04 -05:00
parent b863f4a39a
commit 7514e326f8
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gallium/drivers/swr/swr_screen.cpp
View file

@ -55,7 +55,7 @@ extern "C" {
* Max texture sizes
* XXX Check max texture size values against core and sampler.
*/
#define SWR_MAX_TEXTURE_SIZE (4 * 1048 * 1048 * 1024ULL) /* 4GB */
#define SWR_MAX_TEXTURE_SIZE (4 * 1024 * 1024 * 1024ULL) /* 4GB */
#define SWR_MAX_TEXTURE_2D_LEVELS 14 /* 8K x 8K for now */
#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 */
@ -448,6 +448,20 @@ mesa_to_swr_format(enum pipe_format format)
return R32_FLOAT_X8X24_TYPELESS;
case PIPE_FORMAT_L8A8_UNORM:
return R8G8_UNORM;
case PIPE_FORMAT_DXT1_RGB:
case PIPE_FORMAT_DXT1_RGBA:
return BC1_UNORM;
case PIPE_FORMAT_DXT3_RGBA:
return BC2_UNORM;
case PIPE_FORMAT_DXT5_RGBA:
return BC3_UNORM;
case PIPE_FORMAT_DXT1_SRGB:
case PIPE_FORMAT_DXT1_SRGBA:
return BC1_UNORM_SRGB;
case PIPE_FORMAT_DXT3_SRGBA:
return BC2_UNORM_SRGB;
case PIPE_FORMAT_DXT5_SRGBA:
return BC3_UNORM_SRGB;
default:
break;
}
@ -515,7 +529,7 @@ swr_texture_layout(struct swr_screen *screen,
SWR_FORMAT_INFO finfo = GetFormatInfo(res->swr.format);
unsigned total_size = 0;
size_t total_size = 0;
unsigned width = pt->width0;
unsigned height = pt->height0;
unsigned depth = pt->depth0;