AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: consolidate listing of depth formats

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2011-05-28 15:50:10 +02:00
parent 26d718ff71
commit 6c638b7ca1
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_format.c
+12 -11
View File
@@ -595,6 +595,14 @@ struct format_mapping
PIPE_FORMAT_A8B8G8R8_SRGB, \
0
#define DEFAULT_DEPTH_FORMATS \
PIPE_FORMAT_Z24X8_UNORM, \
PIPE_FORMAT_X8Z24_UNORM, \
PIPE_FORMAT_Z16_UNORM, \
PIPE_FORMAT_Z24_UNORM_S8_USCALED, \
PIPE_FORMAT_S8_USCALED_Z24_UNORM, \
0
/**
* This table maps OpenGL texture format enums to Gallium pipe_format enums.
* Multiple GL enums might map to multiple pipe_formats.
@@ -736,27 +744,20 @@ static struct format_mapping format_map[] = {
/* Depth formats */
{
{ GL_DEPTH_COMPONENT16, 0 },
{ PIPE_FORMAT_Z16_UNORM, PIPE_FORMAT_Z24_UNORM_S8_USCALED,
PIPE_FORMAT_S8_USCALED_Z24_UNORM, PIPE_FORMAT_Z32_UNORM, 0 }
{ PIPE_FORMAT_Z16_UNORM, DEFAULT_DEPTH_FORMATS }
},
{
{ GL_DEPTH_COMPONENT24, 0 },
{ PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM,
PIPE_FORMAT_Z32_UNORM, 0 }
DEFAULT_DEPTH_FORMATS }
},
{
{ GL_DEPTH_COMPONENT32, 0 },
{ PIPE_FORMAT_Z32_UNORM,
PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
PIPE_FORMAT_Z16_UNORM,
PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM, 0 }
{ PIPE_FORMAT_Z32_UNORM, DEFAULT_DEPTH_FORMATS }
},
{
{ GL_DEPTH_COMPONENT, 0 },
{ PIPE_FORMAT_Z24X8_UNORM, PIPE_FORMAT_X8Z24_UNORM,
PIPE_FORMAT_Z32_UNORM, PIPE_FORMAT_Z16_UNORM,
PIPE_FORMAT_Z24_UNORM_S8_USCALED, PIPE_FORMAT_S8_USCALED_Z24_UNORM, 0 }
{ DEFAULT_DEPTH_FORMATS }
},
/* stencil formats */