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

r600g: remove redundant variable r600_pipe_context::blit

This commit is contained in:
Marek Olšák 2011-10-27 12:27:34 +02:00
parent 48dcdcffd6
commit a19e6a8f28
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/r600/r600_blit.c
View File

@ -45,7 +45,6 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op
{
struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
rctx->blit = true;
r600_context_queries_suspend(&rctx->ctx);
util_blitter_save_blend(rctx->blitter, rctx->states[R600_PIPE_STATE_BLEND]);
@ -98,7 +97,6 @@ static void r600_blitter_end(struct pipe_context *ctx)
rctx->saved_render_cond = NULL;
}
r600_context_queries_resume(&rctx->ctx, FALSE);
rctx->blit = false;
}
static unsigned u_num_layers(struct pipe_resource *r, unsigned level)

1
src/gallium/drivers/r600/r600_pipe.h
View File

@ -229,7 +229,6 @@ struct r600_pipe_context {
struct u_vbuf_mgr *vbuf_mgr;
struct util_slab_mempool pool_transfers;
boolean blit;
boolean have_depth_texture, have_depth_fb;
unsigned default_ps_gprs, default_vs_gprs;

3
src/gallium/drivers/r600/r600_state_common.c
View File

@ -24,6 +24,7 @@
* Authors: Dave Airlie <airlied@redhat.com>
* Jerome Glisse <jglisse@redhat.com>
*/
#include "util/u_blitter.h"
#include "util/u_memory.h"
#include "util/u_format.h"
#include "pipebuffer/pb_buffer.h"
@ -554,7 +555,7 @@ static int r600_shader_rebuild(struct pipe_context * ctx, struct r600_pipe_shade
static void r600_update_derived_state(struct r600_pipe_context *rctx)
{
if (!rctx->blit) {
if (!rctx->blitter->running) {
if (rctx->have_depth_fb || rctx->have_depth_texture)
r600_flush_depth_textures(rctx);
}