Module: Mesa Branch: 10.1 Commit: 93fae5e68edbd33d26b3722d1cb2aff00c429ac8 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=93fae5e68edbd33d26b3722d1cb2aff00c429ac8
Author: Anuj Phogat <[email protected]> Date: Fri Mar 21 13:07:13 2014 -0700 mesa: Allow srcFormat=GL_DEPTH_STENCIL in _mesa_texstore_xx_xx() functions _mesa_texstore_z24_s8() and _mesa_texstore_z32f_x24s8() are capable of handling GL_DEPTH_STENCIL format. So, allow it in both the functions. Cc: <[email protected]> Signed-off-by: Anuj Phogat <[email protected]> Reviewed-by: Ian Romanick <[email protected]> (cherry picked from commit 1a8f9ba9b3aa8bed2047ff7c0b5816edb9c9cb62) --- src/mesa/main/texstore.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c index 416bf76..cbe160d 100644 --- a/src/mesa/main/texstore.c +++ b/src/mesa/main/texstore.c @@ -2483,7 +2483,8 @@ _mesa_texstore_z24_s8(TEXSTORE_PARAMS) srcType == GL_FLOAT_32_UNSIGNED_INT_24_8_REV); if (srcFormat == GL_DEPTH_COMPONENT || - srcFormat == GL_STENCIL_INDEX) { + srcFormat == GL_STENCIL_INDEX || + srcFormat == GL_DEPTH_STENCIL) { GLuint *depth = malloc(srcWidth * sizeof(GLuint)); GLubyte *stencil = malloc(srcWidth * sizeof(GLubyte)); @@ -3438,7 +3439,8 @@ _mesa_texstore_z32f_x24s8(TEXSTORE_PARAMS) srcType == GL_FLOAT_32_UNSIGNED_INT_24_8_REV); if (srcFormat == GL_DEPTH_COMPONENT || - srcFormat == GL_STENCIL_INDEX) { + srcFormat == GL_STENCIL_INDEX || + srcFormat == GL_DEPTH_STENCIL) { GLint img, row; const GLint srcRowStride = _mesa_image_row_stride(srcPacking, srcWidth, srcFormat, srcType) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
