[Mesa-dev] [PATCH 20/22] i965/gen7: merge defines for 3DSTATE{VS, GS, WM} dword 2

[Paul Berry]

On 28 August 2013 20:16, Kenneth Graunke <kenneth at whitecape.org> wrote:

> On 08/26/2013 03:12 PM, Paul Berry wrote:
>
>> Dword 2 of all 3DSTATE commands is the same, so there's no need tohave
>>
>
> Well, not -all- 3DSTATE commands...just these :)
>
> It's weird that you decided to share the bits for 3DSTATE_VS, 3DSTATE_GS,
> and 3DSTATE_WM on SNB, but not GEN7_PS_* for 3DSTATE_PS on IVB.  If you're
> going to do WM, you might as well do PS too...
>
>
>  separate defines for it.  This will allow us to unify some of the
>> state setup code between VS and GS.
>> ---
>>   src/mesa/drivers/dri/i965/brw_**defines.h   | 30
>> +++++++++---------------------
>>   src/mesa/drivers/dri/i965/**gen6_blorp.cpp  |  2 +-
>>   src/mesa/drivers/dri/i965/**gen6_gs_state.c |  6 +++---
>>   src/mesa/drivers/dri/i965/**gen6_vs_state.c |  4 ++--
>>   src/mesa/drivers/dri/i965/**gen6_wm_state.c |  4 ++--
>>   src/mesa/drivers/dri/i965/**gen7_disable.c  |  4 ++--
>>   src/mesa/drivers/dri/i965/**gen7_vs_state.c |  4 ++--
>>   7 files changed, 21 insertions(+), 33 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/i965/**brw_defines.h
>> b/src/mesa/drivers/dri/i965/**brw_defines.h
>> index ec6c854..d698757 100644
>> --- a/src/mesa/drivers/dri/i965/**brw_defines.h
>> +++ b/src/mesa/drivers/dri/i965/**brw_defines.h
>> @@ -1303,14 +1303,16 @@ enum brw_message_target {
>>
>>   #define _3DSTATE_SCISSOR_STATE_**POINTERS               0x780f /*
>> GEN6+ */
>>
>> -#define _3DSTATE_VS                            0x7810 /* GEN6+ */
>> +/* Common to _3DSTATE_{VS,GS} */
>>
>
> No mention of WM here.  Maybe:
> /* Common to 3DSTATE_{VS,GS,PS|WM} */


Both of these are good points.  Fixed.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20130829/6ee5daf0/attachment.html>