[Mesa-dev] [PATCH] tgsi: add GS_INVOCATIONS to property names array

Ilia Mirkin imirkin at alum.mit.edu
Tue May 20 08:41:29 PDT 2014


On Tue, May 20, 2014 at 11:28 AM, Roland Scheidegger <sroland at vmware.com> wrote:
> On 05/20/2014 04:56 AM, Ilia Mirkin wrote:
>>
>> In commit 4be146b1, I neglected to add the new property to the strings
>> array. This leads to the string '(null)' to be printed instead when
>> converting a GS shader to text.
>>
>> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
>> Cc: "10.2" <mesa-stable at lists.freedesktop.org>
>> ---
>>   src/gallium/auxiliary/tgsi/tgsi_strings.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/gallium/auxiliary/tgsi/tgsi_strings.c
>> b/src/gallium/auxiliary/tgsi/tgsi_strings.c
>> index 5b6e47f..34dec4f 100644
>> --- a/src/gallium/auxiliary/tgsi/tgsi_strings.c
>> +++ b/src/gallium/auxiliary/tgsi/tgsi_strings.c
>> @@ -120,7 +120,8 @@ const char *tgsi_property_names[TGSI_PROPERTY_COUNT] =
>>      "FS_COORD_PIXEL_CENTER",
>>      "FS_COLOR0_WRITES_ALL_CBUFS",
>>      "FS_DEPTH_LAYOUT",
>> -   "VS_PROHIBIT_UCPS"
>> +   "VS_PROHIBIT_UCPS",
>> +   "GS_INVOCATIONS",
>>   };
>>
>>   const char *tgsi_type_names[5] =
>>
>
> Reviewed-by: Roland Scheidegger <sroland at vmware.com>

Thanks!

>
> This adds a trailing comma. But some arrays have them, some not, and I have
> no idea what the convention here should be

I've been sneakily adding them to arrays I've been modifying for a
while, no one's complained of compilation failures/etc. I think it's
better to have them, since the diffs look cleaner when adding items
(no need to modify the last item anymore).

  -ilia


More information about the mesa-dev mailing list