OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: ignore StencilSampling if stencil not part of the format

Browse Source 
This avoids hitting assert in debug builds and incorrect rendering
on release in case GL_DEPTH_STENCIL_TEXTURE_MODE has been set to
GL_STENCIL_INDEX with a texture that does not have stencil.

Cc: mesa-stable
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25610>
This commit is contained in:
Tapani Pälli
2023-10-09 07:54:55 +03:00
committed by Marge Bot
parent ed2cac0f1e
commit f33d937608
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/mesa/state_tracker/st_atom_sampler.c
View File

@@ -112,11 +112,20 @@ st_convert_sampler(const struct st_context *st,
/* This is true if wrap modes are using the border color: */ /* This is true if wrap modes are using the border color: */
(sampler->wrap_s | sampler->wrap_t | sampler->wrap_r) & 0x1) { (sampler->wrap_s | sampler->wrap_t | sampler->wrap_r) & 0x1) {
GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat; GLenum texBaseFormat = _mesa_base_tex_image(texobj)->_BaseFormat;
/* From OpenGL 4.3 spec, "Combined Depth/Stencil Textures":
*
* "The DEPTH_STENCIL_TEXTURE_MODE is ignored for non
* depth/stencil textures.
*/
const bool has_combined_ds = texBaseFormat == GL_DEPTH_STENCIL;
const GLboolean is_integer = const GLboolean is_integer =
texobj->_IsIntegerFormat || texobj->StencilSampling || texobj->_IsIntegerFormat ||
(texobj->StencilSampling && has_combined_ds) ||
texBaseFormat == GL_STENCIL_INDEX; texBaseFormat == GL_STENCIL_INDEX;
if (texobj->StencilSampling) if (texobj->StencilSampling && has_combined_ds)
texBaseFormat = GL_STENCIL_INDEX; texBaseFormat = GL_STENCIL_INDEX;
if (st->apply_texture_swizzle_to_border_color || if (st->apply_texture_swizzle_to_border_color ||

11
src/mesa/state_tracker/st_sampler_view.c
View File

@@ -361,10 +361,19 @@ st_get_sampler_view_format(const struct st_context *st,
GLenum baseFormat = _mesa_base_tex_image(texObj)->_BaseFormat; GLenum baseFormat = _mesa_base_tex_image(texObj)->_BaseFormat;
format = texObj->surface_based ? texObj->surface_format : texObj->pt->format; format = texObj->surface_based ? texObj->surface_format : texObj->pt->format;
/* From OpenGL 4.3 spec, "Combined Depth/Stencil Textures":
*
* "The DEPTH_STENCIL_TEXTURE_MODE is ignored for non
* depth/stencil textures.
*/
const bool has_combined_ds =
baseFormat == GL_DEPTH_STENCIL;
if (baseFormat == GL_DEPTH_COMPONENT || if (baseFormat == GL_DEPTH_COMPONENT ||
baseFormat == GL_DEPTH_STENCIL || baseFormat == GL_DEPTH_STENCIL ||
baseFormat == GL_STENCIL_INDEX) { baseFormat == GL_STENCIL_INDEX) {
if (texObj->StencilSampling || baseFormat == GL_STENCIL_INDEX) if ((texObj->StencilSampling && has_combined_ds) ||
baseFormat == GL_STENCIL_INDEX)
format = util_format_stencil_only(format); format = util_format_stencil_only(format);
return format; return format;