diff options
| author | Ilia Mirkin <[email protected]> | 2014-05-10 10:25:29 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-05-11 19:26:31 -0400 |
| commit | 64a7ddf40de45ad964502c3b05392b0190464177 (patch) | |
| tree | adac3ef74c33e267732e45be4add73113cc0cab1 | |
| parent | 752ce0affb1bc45a3caa67b7a2788eec30a9f85f (diff) | |
mesa/st: leave current query enabled during glBlitFramebuffer
Also make sure that pipe_blit_info gets zero'd out so that query isn't
accidentally left enabled.
Signed-off-by: Ilia Mirkin <[email protected]>
Cc: "10.2" <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/mesa/state_tracker/st_cb_blit.c | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_readpixels.c | 1 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_cb_texture.c | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_cb_blit.c b/src/mesa/state_tracker/st_cb_blit.c index a5a0d2d8d26..9c33f4eb99c 100644 --- a/src/mesa/state_tracker/st_cb_blit.c +++ b/src/mesa/state_tracker/st_cb_blit.c @@ -187,6 +187,7 @@ st_BlitFramebuffer(struct gl_context *ctx, } blit.filter = pFilter; + blit.render_condition_enable = TRUE; if (mask & GL_COLOR_BUFFER_BIT) { struct gl_renderbuffer_attachment *srcAtt = diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index b92147847e4..3f7bbd9738c 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -165,6 +165,7 @@ st_readpixels(struct gl_context *ctx, GLint x, GLint y, goto fallback; } + memset(&blit, 0, sizeof(blit)); blit.src.resource = src; blit.src.level = strb->surface->u.tex.level; blit.src.format = src_format; diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c index 97bba8b7da5..aa6b05f0b60 100644 --- a/src/mesa/state_tracker/st_cb_texture.c +++ b/src/mesa/state_tracker/st_cb_texture.c @@ -765,6 +765,7 @@ st_TexSubImage(struct gl_context *ctx, GLuint dims, _mesa_unmap_teximage_pbo(ctx, unpack); /* Blit. */ + memset(&blit, 0, sizeof(blit)); blit.src.resource = src; blit.src.level = 0; blit.src.format = src_format; @@ -998,6 +999,7 @@ st_GetTexImage(struct gl_context * ctx, height = 1; } + memset(&blit, 0, sizeof(blit)); blit.src.resource = src; blit.src.level = texImage->Level; blit.src.format = src_format; |