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

meta: Fix ClearTexture with GL_DEPTH_COMPONENT.

Browse Source 
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" <mesa-stable@lists.freedesktop.org>
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 <tapani.palli@intel.com>
This commit is contained in:
Kenneth Graunke
2017-03-21 00:30:06 -07:00
parent d6d16c0218
commit 8705ed13e3
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/drivers/common/meta.c
+14 -9
View File
@@ -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)