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

st/glx: better format selection in xmesa_choose_z_stencil_format()

Browse Source 
This is a back-port of commit ef2664da6c
from master.
This commit is contained in:
Brian Paul
2010-03-23 08:58:09 -06:00
parent 2ded27b2f0
commit 4ceeb1307a
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/glx/xlib/xm_api.c
+24 -17
View File
@@ -324,7 +324,7 @@ choose_pixel_format(XMesaVisual v)
* at least matches the given depthBits and stencilBits.
*/
static void
xmesa_choose_z_stencil_format(int depthBits, int stencilBits,
xmesa_choose_z_stencil_format(int depth, int stencil,
enum pipe_format *depthFormat,
enum pipe_format *stencilFormat)
{
@@ -332,20 +332,28 @@ xmesa_choose_z_stencil_format(int depthBits, int stencilBits,
const unsigned tex_usage = PIPE_TEXTURE_USAGE_DEPTH_STENCIL;
const unsigned geom_flags = (PIPE_TEXTURE_GEOM_NON_SQUARE |
PIPE_TEXTURE_GEOM_NON_POWER_OF_TWO);
static enum pipe_format formats[] = {
PIPE_FORMAT_S8Z24_UNORM,
PIPE_FORMAT_Z24S8_UNORM,
PIPE_FORMAT_Z16_UNORM,
PIPE_FORMAT_Z32_UNORM
};
int i;
enum pipe_format formats[8];
int count, i;
assert(screen);
count = 0;
*depthFormat = *stencilFormat = PIPE_FORMAT_NONE;
if (depth <= 16 && stencil == 0) {
formats[count++] = PIPE_FORMAT_Z16_UNORM;
}
if (depth <= 24 && stencil == 0) {
formats[count++] = PIPE_FORMAT_X8Z24_UNORM;
formats[count++] = PIPE_FORMAT_Z24X8_UNORM;
}
if (depth <= 24 && stencil <= 8) {
formats[count++] = PIPE_FORMAT_S8Z24_UNORM;
formats[count++] = PIPE_FORMAT_Z24S8_UNORM;
}
if (depth <= 32 && stencil == 0) {
formats[count++] = PIPE_FORMAT_Z32_UNORM;
}
/* search for supported format */
for (i = 0; i < Elements(formats); i++) {
*depthFormat = PIPE_FORMAT_NONE;
for (i = 0; i < count; i++) {
if (screen->is_format_supported(screen, formats[i],
target, tex_usage, geom_flags)) {
*depthFormat = formats[i];
@@ -353,13 +361,12 @@ xmesa_choose_z_stencil_format(int depthBits, int stencilBits,
}
}
if (stencilBits) {
if (stencil) {
*stencilFormat = *depthFormat;
}
/* XXX we should check that he chosen format has at least as many bits
* as what was requested.
*/
else {
*stencilFormat = PIPE_FORMAT_NONE;
}
}