summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-11-30 20:10:33 +0000
committerDave Airlie <airlied@redhat.com>2011-12-10 09:02:38 +0000
commit8c713626db33c40c18e24c880fe47d7948f4dcd7 (patch)
treebc456bdd1dd64ca9e7bc95e6aa8ce9bc01093f0f
parentf767e96131ba69cf61aa9f848d5f24e4396ac920 (diff)
st/mesa: only resolve is number of samples is > 1
This fixes the firefox crash but I've no idea if its correct. Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--src/mesa/state_tracker/st_cb_blit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c
index 750f541b5d..8f0c2e8716 100644
--- a/src/mesa/state_tracker/st_cb_blit.c
+++ b/src/mesa/state_tracker/st_cb_blit.c
@@ -178,7 +178,7 @@ 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) {