fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 19:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r300/compiler: rc_reader_data: Add ExitOnAbort flag

Browse source
This commit is contained in:
Tom Stellard 2011-01-30 15:29:29 -08:00
parent bbcee3268a
commit 4f4d1d06da
5 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/r300/compiler/radeon_dataflow.c
View file

@ -592,7 +592,7 @@ static void get_readers_pair_read_callback(
if (d->ReadPairCB)
d->ReadPairCB(d->ReaderData, inst, arg, src);
if (d->ReaderData->Abort)
if (d->ReaderData->ExitOnAbort && d->ReaderData->Abort)
return;
add_reader_pair(&d->C->Pool, d->ReaderData, inst, shared_mask, arg, src);
@ -620,7 +620,7 @@ static void get_readers_normal_read_callback(
if (d->ReadNormalCB)
d->ReadNormalCB(d->ReaderData, inst, src);
if (d->ReaderData->Abort)
if (d->ReaderData->ExitOnAbort && d->ReaderData->Abort)
return;
add_reader_normal(&d->C->Pool, d->ReaderData, inst, shared_mask, src);
@ -767,7 +767,7 @@ static void get_readers_for_single_write(
}
rc_for_all_writes_mask(tmp, get_readers_write_callback, d);
if (d->ReaderData->Abort)
if (d->ReaderData->ExitOnAbort && d->ReaderData->Abort)
return;
if (branch_depth == 0 && !d->AliveWriteMask)

3
src/mesa/drivers/dri/r300/compiler/radeon_dataflow.h
View file

@ -94,6 +94,9 @@ struct rc_reader_data {
unsigned int ReadersReserved;
struct rc_reader * Readers;
/* If this flag is enabled, rc_get_readers will exit as soon possbile
* after the Abort flag is set.*/
unsigned int ExitOnAbort;
void * CbData;
};

2
src/mesa/drivers/dri/r300/compiler/radeon_optimize.c
View file

@ -144,6 +144,7 @@ static void copy_propagate(struct radeon_compiler * c, struct rc_instruction * i
return;
/* Get a list of all the readers of this MOV instruction. */
reader_data.ExitOnAbort = 1;
rc_get_readers(c, inst_mov, &reader_data,
copy_propagate_scan_read, NULL,
is_src_clobbered_scan_write);
@ -453,6 +454,7 @@ static int presub_helper(
rc_presubtract_op cb_op = presub_opcode;
reader_data.CbData = &cb_op;
reader_data.ExitOnAbort = 1;
rc_get_readers(c, inst_add, &reader_data, presub_scan_read, NULL,
is_src_clobbered_scan_write);

1
src/mesa/drivers/dri/r300/compiler/radeon_pair_schedule.c
View file

@ -952,6 +952,7 @@ static void schedule_block(struct r300_fragment_program_compiler * c,
instruction_ready(&s, s.Current);
/* Get global readers for possible RGB->Alpha conversion. */
s.Current->GlobalReaders.ExitOnAbort = 1;
rc_get_readers(s.C, inst, &s.Current->GlobalReaders,
is_rgb_to_alpha_possible_normal,
is_rgb_to_alpha_possible, NULL);

1
src/mesa/drivers/dri/r300/compiler/radeon_rename_regs.c
View file

@ -71,6 +71,7 @@ void rc_rename_regs(struct radeon_compiler *c, void *user)
if (inst->U.I.DstReg.File != RC_FILE_TEMPORARY)
continue;
reader_data.ExitOnAbort = 1;
rc_get_readers(c, inst, &reader_data, NULL, NULL, NULL);
if (reader_data.Abort || reader_data.ReaderCount == 0)