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

intel: Clarify the depthRb == stencilRb logic. 

Reviewed-by: Chad Versace <chad@chad-versace.us>
This commit is contained in:
Eric Anholt 2011-07-12 10:01:32 -07:00
parent 96cdbf4340
commit 8cf2741d2b
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mesa/drivers/dri/intel/intel_fbo.c
View File

@ -783,22 +783,21 @@ intel_validate_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
* The depth and stencil renderbuffers are the same renderbuffer or wrap
* the same texture.
*/
bool depth_stencil_are_same;
if (depthRb && stencilRb && depthRb == stencilRb)
depth_stencil_are_same = true;
else if (depthRb && stencilRb && depthRb != stencilRb
&& (fb->Attachment[BUFFER_DEPTH].Type == GL_TEXTURE)
&& (fb->Attachment[BUFFER_STENCIL].Type == GL_TEXTURE)
&& (fb->Attachment[BUFFER_DEPTH].Texture->Name
== fb->Attachment[BUFFER_STENCIL].Texture->Name))
depth_stencil_are_same = true;
else
depth_stencil_are_same = false;
if (depthRb && stencilRb) {
bool depth_stencil_are_same;
if (depthRb == stencilRb)
depth_stencil_are_same = true;
else if ((fb->Attachment[BUFFER_DEPTH].Type == GL_TEXTURE) &&
(fb->Attachment[BUFFER_STENCIL].Type == GL_TEXTURE) &&
(fb->Attachment[BUFFER_DEPTH].Texture->Name ==
fb->Attachment[BUFFER_STENCIL].Texture->Name))
depth_stencil_are_same = true;
else
depth_stencil_are_same = false;
if (!intel->has_separate_stencil
&& depthRb && stencilRb
&& !depth_stencil_are_same) {
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
if (!intel->has_separate_stencil && !depth_stencil_are_same) {
fb->_Status = GL_FRAMEBUFFER_UNSUPPORTED_EXT;
}
}
for (i = 0; i < Elements(fb->Attachment); i++) {