[Mesa-dev] [PATCH 5/5] nvc0: shift driver constant buffer offsets by 32 bytes

[Samuel Pitoiset]

On 03/16/2016 11:17 AM, Samuel Pitoiset wrote:
> The offsets are wrong in this patch... But even after fixing them I have
> a few number of regressions (~10 piglit tests). Anyway, these changes
> are not too useful for now, so I'm going to get rid of it.
>
> I'll now try with Kepler.

Confirmed, no regressions on both Fermi and Kepler.
Except this patch that will be removed, this series (especially the 
patch which removes unused data in the driver constbuf) doesn't break 
anything. :-)

>
> On 03/15/2016 09:55 PM, Samuel Pitoiset wrote:
>> The first 32 bytes of the driver constant buffer are currently unused.
>>
>> Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
>> ---
>>   src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 10 +++++-----
>>   1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
>> b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
>> index c63d138..e54018b 100644
>> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
>> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
>> @@ -105,18 +105,18 @@
>>   #define NVC0_CB_AUX_INFO(s)         NVC0_CB_USR_SIZE + (s << 10)
>>   #define NVC0_CB_AUX_SIZE            (6 << 10)
>>   /* 32 textures handles, at 1 32-bits integer each */
>> -#define NVC0_CB_AUX_TEX_INFO(i)     0x020 + (i) * 4
>> +#define NVC0_CB_AUX_TEX_INFO(i)     0x000 + (i) * 4
>>   #define NVC0_CB_AUX_TEX_SIZE        (32 * 4)
>>   /* 8 user clip planes, at 4 32-bits floats each */
>> -#define NVC0_CB_AUX_UCP_INFO        0x100
>> +#define NVC0_CB_AUX_UCP_INFO        0x080
>>   #define NVC0_CB_AUX_UCP_SIZE        (PIPE_MAX_CLIP_PLANES * 4 * 4)
>>   /* 8 sets of 32-bits integer pairs sample offsets */
>> -#define NVC0_CB_AUX_SAMPLE_INFO     0x180 /* FP */
>> +#define NVC0_CB_AUX_SAMPLE_INFO     0x160 /* FP */
>>   #define NVC0_CB_AUX_SAMPLE_SIZE     (8 * 4 * 2)
>>   /* draw parameters (index bais, base instance, drawid) */
>> -#define NVC0_CB_AUX_DRAW_INFO       0x180 /* VP */
>> +#define NVC0_CB_AUX_DRAW_INFO       0x160 /* VP */
>>   /* 32 user buffers, at 4 32-bits integers each */
>> -#define NVC0_CB_AUX_BUF_INFO(i)     0x200 + (i) * 4 * 4
>> +#define NVC0_CB_AUX_BUF_INFO(i)     0x180 + (i) * 4 * 4
>>   #define NVC0_CB_AUX_BUF_SIZE        (NVC0_MAX_BUFFERS * 4 * 4)
>>   /* 4 32-bits floats for the vertex runout, put at the end */
>>   #define NVC0_CB_AUX_RUNOUT_INFO     NVC0_CB_USR_SIZE + NVC0_CB_AUX_SIZE
>>