On Tue, Oct 28, 2014 at 4:36 PM, Matt Turner <matts...@gmail.com> wrote:
> On Tue, Oct 28, 2014 at 3:17 PM, Kristian Høgsberg <k...@bitplanet.net> wrote:
>> These last few operations all only apply when we've actually generated code,
>> optimized and allocated registers. The dummy and the repclear shaders don't
>> touch uncompressed_stack, don't need the gen4 send workaround, and don't
>> spill. This means we can move these lines into the else-branch, which will
>> make the following refactoring easier.
>>
>> Signed-off-by: Kristian Høgsberg <k...@bitplanet.net>
>> ---
>> src/mesa/drivers/dri/i965/brw_fs.cpp | 24 ++++++++++++------------
>> 1 file changed, 12 insertions(+), 12 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp
>> b/src/mesa/drivers/dri/i965/brw_fs.cpp
>> index e8819ef..cfb56bb 100644
>> --- a/src/mesa/drivers/dri/i965/brw_fs.cpp
>> +++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
>> @@ -3649,22 +3649,22 @@ fs_visitor::run()
>> break;
>> }
>> }
>> - }
>> - assert(force_uncompressed_stack == 0);
>>
>> - /* This must come after all optimization and register allocation, since
>> - * it inserts dead code that happens to have side effects, and it does
>> - * so based on the actual physical registers in use.
>> - */
>> - insert_gen4_send_dependency_workarounds();
>> + assert(force_uncompressed_stack == 0);
>>
>> - if (failed)
>> - return false;
>> + /* This must come after all optimization and register allocation,
>> since
>> + * it inserts dead code that happens to have side effects, and it does
>> + * so based on the actual physical registers in use.
>> + */
>> + insert_gen4_send_dependency_workarounds();
>> +
>> + if (failed)
>> + return false;
>>
>> - if (!allocated_without_spills)
>> - schedule_instructions(SCHEDULE_POST);
>> + if (!allocated_without_spills)
>> + schedule_instructions(SCHEDULE_POST);
>>
>> - if (last_scratch > 0) {
>> + if (last_scratch > 0)
>> prog_data->total_scratch = brw_get_scratch_size(last_scratch);
>
> Need to indent this line too.
Yup.
Kristian
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
