diff options
| author | Eric Anholt <[email protected]> | 2020-01-13 13:06:01 -0800 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-01-13 23:37:54 +0000 |
| commit | 3be4b89c038554ceb95ba24c00f50c0f2db3a646 (patch) | |
| tree | b400f029e58f4e99fc058bb234bfc85d406fc489 /src/mesa | |
| parent | 1c6a2efa06e9bb5914f4557118930fc61065a467 (diff) | |
mesa: Fix detection of invalidating both depth and stencil.
Fixes an extra 1024x1024x4 MSAA Z/S store on WebGL fishtank on cheza.
Reported-by: Dave Airlie <[email protected]>
Fixes: db2ae5112106 ("mesa: Skip partial InvalidateFramebuffer of packed depth/stencil.")
Reviewed-by: Kristian H. Kristensen <[email protected]>
Reviewed-by: Rob Clark <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3370>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3370>
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/fbobject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index ea89565cfe2..a34d5099688 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -5070,9 +5070,10 @@ discard_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb, GL_STENCIL_ATTACHMENT : GL_DEPTH_ATTACHMENT); bool has_both = false; for (int j = 0; j < numAttachments; j++) { - if (attachments[j] == other_format) + if (attachments[j] == other_format) { has_both = true; - break; + break; + } } if (fb->Attachment[BUFFER_DEPTH].Renderbuffer != |