From 6c638b7ca1109e9ec0f16e6c13e08928b4d05b23 Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Sat, 28 May 2011 15:50:10 +0200 Subject: st/mesa: consolidate listing of depth formats Reviewed-by: Brian Paul --- src/mesa/state_tracker/st_format.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/mesa/state_tracker') diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 4360ed7d652..c22a1d5984f 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -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 */ -- cgit v1.2.3