diff options
| author | Dave Airlie <[email protected]> | 2011-11-30 20:10:19 +0000 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-02-12 21:35:27 +0100 |
| commit | 094eeff19946138d6306d74e9e62af5e9d192abd (patch) | |
| tree | 720f73b8b0e5f677d0aedddc98901047470a7b2c /src | |
| parent | bd1ae51b13535bc4438c663ffe91ded49db4890a (diff) | |
st/mesa: only resolve if number of samples is > 1
Marek: this fixes a firefox crash and maybe even:
https://bugs.freedesktop.org/show_bug.cgi?id=45943
NOTE: This is a candidate for the 8.0 branch.
Signed-off-by: Dave Airlie <[email protected]>
Signed-off-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_blit.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index 750f541b5dd..27da2c6330a 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -178,7 +178,8 @@ st_BlitFramebuffer(struct gl_context *ctx, st->pipe->render_condition(st->pipe, NULL, 0); } - if (readFB->Visual.sampleBuffers > drawFB->Visual.sampleBuffers) { + if (readFB->Visual.sampleBuffers > drawFB->Visual.sampleBuffers && + readFB->Visual.samples > 1) { struct pipe_resolve_info info; if (dstX0 < dstX1) { |