OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r600g: fix check for empty cs

Browse Source
This commit is contained in:
Vadim Girlin
2011-06-29 16:29:18 +04:00
committed by Alex Deucher
parent 9e9d73ef10
commit 61c976c3cc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,6 +245,7 @@ struct r600_context {
unsigned pm4_cdwords; unsigned pm4_cdwords;
unsigned pm4_dirty_cdwords; unsigned pm4_dirty_cdwords;
unsigned ctx_pm4_ndwords; unsigned ctx_pm4_ndwords;
unsigned init_dwords;
unsigned nreloc; unsigned nreloc;
unsigned creloc; unsigned creloc;
struct r600_reloc *reloc; struct r600_reloc *reloc;

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

@@ -126,9 +126,6 @@ static void r600_flush(struct pipe_context *ctx,
if (rfence) if (rfence)
*rfence = r600_create_fence(rctx); *rfence = r600_create_fence(rctx);
if (!rctx->ctx.pm4_cdwords)
return;
#if 0 #if 0
sprintf(dname, "gallium-%08d.bof", dc); sprintf(dname, "gallium-%08d.bof", dc);
if (dc < 20) { if (dc < 20) {

4
src/gallium/winsys/r600/drm/r600_hw_context.c
View File

@@ -62,6 +62,8 @@ void r600_init_cs(struct r600_context *ctx)
ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_CONTEXT_CONTROL, 1, 0); ctx->pm4[ctx->pm4_cdwords++] = PKT3(PKT3_CONTEXT_CONTROL, 1, 0);
ctx->pm4[ctx->pm4_cdwords++] = 0x80000000; ctx->pm4[ctx->pm4_cdwords++] = 0x80000000;
ctx->pm4[ctx->pm4_cdwords++] = 0x80000000; ctx->pm4[ctx->pm4_cdwords++] = 0x80000000;
ctx->init_dwords = ctx->pm4_cdwords;
} }
static void INLINE r600_context_update_fenced_list(struct r600_context *ctx) static void INLINE r600_context_update_fenced_list(struct r600_context *ctx)
@@ -1496,7 +1498,7 @@ void r600_context_flush(struct r600_context *ctx)
int r; int r;
struct r600_block *enable_block = NULL; struct r600_block *enable_block = NULL;
if (!ctx->pm4_cdwords) if (ctx->pm4_cdwords == ctx->init_dwords)
return; return;
/* suspend queries */ /* suspend queries */