fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 17:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: merge fix

Browse source
This commit is contained in:
Christian König 2011-03-02 20:48:03 +01:00
parent b97e41c7b1
commit ed12c29bc4
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/r600/r600_asm.c
View file

@ -1529,7 +1529,7 @@ enum cf_class
CF_CLASS_EXPORT, CF_CLASS_EXPORT,
CF_CLASS_OTHER CF_CLASS_OTHER
}; };
static enum cf_class r600_bc_cf_class(struct r600_bc_cf *cf) static enum cf_class r600_bc_cf_class(struct r600_bc_cf *cf)
{ {
switch (cf->inst) { switch (cf->inst) {
@ -1561,6 +1561,7 @@ static enum cf_class r600_bc_cf_class(struct r600_bc_cf *cf)
case V_SQ_CF_WORD1_SQ_CF_INST_LOOP_BREAK: case V_SQ_CF_WORD1_SQ_CF_INST_LOOP_BREAK:
case V_SQ_CF_WORD1_SQ_CF_INST_CALL_FS: case V_SQ_CF_WORD1_SQ_CF_INST_CALL_FS:
case V_SQ_CF_WORD1_SQ_CF_INST_RETURN: case V_SQ_CF_WORD1_SQ_CF_INST_RETURN:
case V_SQ_CF_WORD1_SQ_CF_INST_NOP:
return CF_CLASS_OTHER; return CF_CLASS_OTHER;
default: default:
@ -1929,7 +1930,7 @@ static void find_replacement(struct gpr_usage usage[128], unsigned current,
unsigned i, j; unsigned i, j;
int best_gpr = -1, best_rate = 0x7FFFFFFF; int best_gpr = -1, best_rate = 0x7FFFFFFF;
if (range->replacement == current) if (range->replacement == current)
return; /* register prefers to be not remapped */ return; /* register prefers to be not remapped */
if (range->replacement != -1 && range->replacement <= current) { if (range->replacement != -1 && range->replacement <= current) {
@ -3079,6 +3080,7 @@ int r600_vertex_elements_build_fetch_shader(struct r600_pipe_context *rctx, stru
} }
r600_bc_add_cfinst(&bc, BC_INST(&bc, V_SQ_CF_WORD1_SQ_CF_INST_RETURN)); r600_bc_add_cfinst(&bc, BC_INST(&bc, V_SQ_CF_WORD1_SQ_CF_INST_RETURN));
r600_bc_add_cfinst(&bc, BC_INST(&bc, V_SQ_CF_WORD1_SQ_CF_INST_NOP));
/* use PIPE_BIND_VERTEX_BUFFER so we use the cache buffer manager */ /* use PIPE_BIND_VERTEX_BUFFER so we use the cache buffer manager */
ve->fetch_shader = r600_bo(rctx->radeon, bc.ndw*4, 256, PIPE_BIND_VERTEX_BUFFER, 0); ve->fetch_shader = r600_bo(rctx->radeon, bc.ndw*4, 256, PIPE_BIND_VERTEX_BUFFER, 0);