diff options
author | Kenneth Graunke <[email protected]> | 2017-03-21 00:30:06 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2017-12-06 20:35:46 -0800 |
commit | 8705ed13e3114ad994dbd46387576749f54fc7eb (patch) | |
tree | 2fce1608164e98afcc145dc874008e27a826d3a7 /src/mesa/drivers/common | |
parent | d6d16c02180929278dc49d3c9bdceece0aab189e (diff) |
meta: Fix ClearTexture with GL_DEPTH_COMPONENT.
We only handled unpacking for GL_DEPTH_STENCIL formats.
Cemu was hitting _mesa_problem() for an unsupported format in
_mesa_unpack_float_32_uint_24_8_depth_stencil_row(), because the
format was depth-only, rather than depth-stencil.
Cc: "13.0 12.0" <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=94739
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103966
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/mesa/drivers/common')
-rw-r--r-- | src/mesa/drivers/common/meta.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 85ac7a1fed6..52d959a710f 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3510,15 +3510,20 @@ cleartexsubimage_depth_stencil(struct gl_context *ctx, /* Convert the clearValue from whatever format it's in to a floating * point value for the depth and an integer value for the stencil index */ - _mesa_unpack_float_32_uint_24_8_depth_stencil_row(texImage->TexFormat, - 1, /* n */ - clearValue, - depthStencilValue); - /* We need a memcpy here instead of a cast because we need to - * reinterpret the bytes as a float rather than converting it - */ - memcpy(&depthValue, depthStencilValue, sizeof depthValue); - stencilValue = depthStencilValue[1] & 0xff; + if (texImage->_BaseFormat == GL_DEPTH_STENCIL) { + _mesa_unpack_float_32_uint_24_8_depth_stencil_row(texImage->TexFormat, + 1, /* n */ + clearValue, + depthStencilValue); + /* We need a memcpy here instead of a cast because we need to + * reinterpret the bytes as a float rather than converting it + */ + memcpy(&depthValue, depthStencilValue, sizeof depthValue); + stencilValue = depthStencilValue[1] & 0xff; + } else { + _mesa_unpack_float_z_row(texImage->TexFormat, 1 /* n */, + clearValue, &depthValue); + } } if (texImage->_BaseFormat == GL_DEPTH_STENCIL) |