From cd5417aac72ae1de85dd6bca3d53d2e2f2d7e546 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 24 May 2011 08:59:09 -0600 Subject: [PATCH] st/mesa: prefer formats without stencil for DEPTH_COMPONENT MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit for fast Z clears to be used more often. Original patch by Marek Olšák. Rebased to table-driven st_choose_format() by Brian Paul. --- src/mesa/state_tracker/st_format.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 6ebe721bfd6..de30b4fc610 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -741,8 +741,9 @@ static struct format_mapping format_map[] = { }, { { GL_DEPTH_COMPONENT24, 0 }, - { PIPE_FORMAT_Z24_UNORM_S8_USCALED, - PIPE_FORMAT_S8_USCALED_Z24_UNORM, PIPE_FORMAT_Z32_UNORM, 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 } }, { { GL_DEPTH_COMPONENT32, 0 }, @@ -750,8 +751,9 @@ static struct format_mapping format_map[] = { }, { { GL_DEPTH_COMPONENT, 0 }, - { PIPE_FORMAT_Z32_UNORM, PIPE_FORMAT_Z24_UNORM_S8_USCALED, - PIPE_FORMAT_S8_USCALED_Z24_UNORM, PIPE_FORMAT_Z16_UNORM, 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 } }, /* stencil formats */ -- 2.30.2