[PATCH 2/7] wined3d: Change black-/whitelist to more neutral words

André Hentschel nerv at dawncrow.de
Tue Jun 16 14:04:12 CDT 2020


Am 16.06.20 um 16:30 schrieb Henri Verbeet:
> On Tue, 16 Jun 2020 at 18:05, André Hentschel <nerv at dawncrow.de> wrote:
>> diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c
>> index 0c7f953702c..c46acfe97ff 100644
>> --- a/dlls/wined3d/adapter_gl.c
>> +++ b/dlls/wined3d/adapter_gl.c
>> @@ -964,7 +964,7 @@ static void quirk_texcoord_w(struct wined3d_gl_info *gl_info)
>>       * application.
>>       *
>>       * ATI Radeon HD 2xxx cards on macOS have the issue. Instead of checking
>> -     * for the buggy cards, blacklist all Radeon cards on macOS and whitelist
>> +     * for the buggy cards, blocklist all Radeon cards on macOS and allowlist
>>       * the good ones. That way we're prepared for the future. If this
>>       * workaround is activated on cards that do not need it, it won't break
>>       * things, just affect performance negatively. */
> 
> I was going to suggest something along the lines of "..., apply the
> quirk to ... and add exceptions for ...", but the truth is that with
> current Wine, someone would have to go out of his way to run an
> unsupported configuration in order to get fixed-function fragment
> processing on the affected cards. I would suggest to just get rid of
> the entire thing.
> 
>> @@ -1506,11 +1506,11 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada
>>      if (!ds_format->depth_size && !ds_format->stencil_size)
>>          return FALSE;
>>
>> -    /* Blacklist formats not supported on Windows */
>> +    /* Blocklist formats not supported on Windows */
>>      if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */
>>              || ds_format->id == WINED3DFMT_S4X4_UINT_D24_UNORM)
>>      {
>> -        TRACE("Format %s is blacklisted.\n", debug_d3dformat(ds_format->id));
>> +        TRACE("Format %s is blocklisted.\n", debug_d3dformat(ds_format->id));
>>          return FALSE;
>>      }
> 
> Somewhat similarly, the better fix here is probably to simply remove
> the entries for WINED3DFMT_S1_UINT_D15_UNORM and
> WINED3DFMT_S4X4_UINT_D24_UNORM from format_texture_info[] and get rid
> of this entire block here.
> 
> I can send patches for those, if you prefer.
> 

Thanks for your input! And yes, if you change it to your likes is better I guess, thanks!



More information about the wine-devel mailing list