intel: Change framebuffer validation criteria
Since all infrastructure is now in place to support packed depth/stencil renderbuffers when using separate stencil, there is no need for special cases when separate stencil is enabled. Signed-off-by: Chad Versace <chad@chad-versace.us>
This commit is contained in:
@@ -836,16 +836,9 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
|
|||||||
else
|
else
|
||||||
depth_stencil_are_same = false;
|
depth_stencil_are_same = false;
|
||||||
|
|
||||||
bool fb_has_combined_depth_stencil_format =
|
if (!intel->has_separate_stencil
|
||||||
(depthRb && depthRb->Base.Format == MESA_FORMAT_S8_Z24) ||
|
&& depthRb && stencilRb
|
||||||
(stencilRb && stencilRb->Base.Format == MESA_FORMAT_S8_Z24);
|
&& !depth_stencil_are_same) {
|
||||||
|
|
||||||
bool fb_has_hiz = intel_framebuffer_has_hiz(fb);
|
|
||||||
|
|
||||||
if ((intel->must_use_separate_stencil || fb_has_hiz)
|
|
||||||
&& (depth_stencil_are_same || fb_has_combined_depth_stencil_format)) {
|
|
||||||
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
|
|
||||||
} else if (!intel->has_separate_stencil && depthRb && stencilRb && !depth_stencil_are_same) {
|
|
||||||
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
|
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user