[PATCH v2 vkd3d 2/4] vkd3d-shader: Implement basic support for #if and #endif.

Zebediah Figura (she/her) zfigura at codeweavers.com
Fri Dec 11 16:26:55 CST 2020


On 12/11/20 12:11 PM, Henri Verbeet wrote:
> On Fri, 11 Dec 2020 at 00:27, Zebediah Figura <zfigura at codeweavers.com> wrote:
>> diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
>> index 5a022708..01a74ede 100644
>> --- a/libs/vkd3d-shader/vkd3d_shader_private.h
>> +++ b/libs/vkd3d-shader/vkd3d_shader_private.h
>> @@ -81,6 +81,10 @@ enum vkd3d_shader_error
>>      VKD3D_SHADER_ERROR_RS_MIXED_DESCRIPTOR_RANGE_TYPES  = 3004,
>>
>>      VKD3D_SHADER_ERROR_PP_INVALID_SYNTAX                = 4000,
>> +
>> +    VKD3D_SHADER_WARNING_PP_INVALID_DIRECTIVE           = 5001,
>> +    VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE           = 5003,
>> +    VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF             = 5005,
>>  };
>>
>>  enum VKD3D_SHADER_INSTRUCTION_HANDLER
>> @@ -867,6 +871,8 @@ void vkd3d_shader_error(struct vkd3d_shader_message_context *context, enum vkd3d
>>          const char *format, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN;
>>  void vkd3d_shader_verror(struct vkd3d_shader_message_context *context,
>>          enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN;
>> +void vkd3d_shader_vwarning(struct vkd3d_shader_message_context *context,
>> +        enum vkd3d_shader_error error, const char *format, va_list args) DECLSPEC_HIDDEN;
>>
> Is reusing enum vkd3d_shader_error for warnings instead of introducing
> a separate enumeration here intentional?
> 

It was intentional, though of course not necessary. I guess my reasoning
was that there's no reason to let any numerical values coincide, and
hence no reason to bother separating the enumerations...
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0x0D9D358A07A17840.asc
Type: application/pgp-keys
Size: 1769 bytes
Desc: not available
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20201211/c80e60e9/attachment-0001.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20201211/c80e60e9/attachment-0001.sig>


More information about the wine-devel mailing list