[Mesa-dev] [PATCH 12/15] i965: Pull out layer_multiplier in intel_update_renderbuffer_wrapper

[Chris Forbes]

Since we're not restricted to C89 in the driver, I put it as close to the
point of use as possible -- but yes, I can move it to the top of the
function if you think that's clearer.


On Thu, Jan 23, 2014 at 6:58 AM, Courtney Goeltzenleuchter <
courtney at lunarg.com> wrote:

>
>
>
> On Tue, Jan 21, 2014 at 3:34 AM, Chris Forbes <chrisf at ijw.co.nz> wrote:
>
>> We're about to need this in another place.
>>
>> Signed-off-by: Chris Forbes <chrisf at ijw.co.nz>
>> ---
>>  src/mesa/drivers/dri/i965/intel_fbo.c | 7 +++++--
>>  1 file changed, 5 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c
>> b/src/mesa/drivers/dri/i965/intel_fbo.c
>> index 4cdf54d..e7c5571 100644
>> --- a/src/mesa/drivers/dri/i965/intel_fbo.c
>> +++ b/src/mesa/drivers/dri/i965/intel_fbo.c
>> @@ -433,16 +433,19 @@ intel_renderbuffer_update_wrapper(struct
>> brw_context *brw,
>>     intel_miptree_check_level_layer(mt, level, layer);
>>     irb->mt_level = level;
>>
>> +   int layer_multiplier;
>>
> Shouldn't this declaration be at the top of the function?
>
>
>>     switch (mt->msaa_layout) {
>>        case INTEL_MSAA_LAYOUT_UMS:
>>        case INTEL_MSAA_LAYOUT_CMS:
>> -         irb->mt_layer = layer * mt->num_samples;
>> +         layer_multiplier = mt->num_samples;
>>           break;
>>
>>        default:
>> -         irb->mt_layer = layer;
>> +         layer_multiplier = 1;
>>     }
>>
>> +   irb->mt_layer = layer_multiplier * layer;
>> +
>>     intel_miptree_reference(&irb->mt, mt);
>>
>>     intel_renderbuffer_set_draw_offset(irb);
>> --
>> 1.8.5.3
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>>
>
>
>
> --
> Courtney Goeltzenleuchter
> LunarG
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20140126/84274eec/attachment.html>