[Piglit] [PATCH v2] khr_texture_compression_astc: change the subtest array declaration to prevent the crash coming from Visual Studio's optimisation

[sandra koroniewska]

Hi, is this code alright now, and if so, can someone push it?
The purpose of these changes was to get rid of the compound literal which
resulted in a crash caused by some Visual Studio optimalisations.

Regards,
Sandra

On Wed, Jun 21, 2017 at 5:34 PM, sandra koroniewska <
sandra.koroniewska at gmail.com> wrote:

> Hi, thanks for your comment. I modified the code a little to get rid of
> the compound literal, but change as little as possible.
>
> Regards,
> Sandra
>
> On Wed, Jun 21, 2017 at 5:32 PM, Sandra Koroniewska <
> sandra.koroniewska at gmail.com> wrote:
>
>> This fixes
>> spec/khr_texture_compression_astc/khr_compressed_astc-array_gl on
>> Intel Windows driver.
>> ---
>>  .../khr_compressed_astc-miptree-array.c            | 27
>> ++++++++++++----------
>>  1 file changed, 15 insertions(+), 12 deletions(-)
>>
>> diff --git a/tests/spec/khr_texture_compression_astc/khr_compressed_astc-miptree-array.c
>> b/tests/spec/khr_texture_compression_astc/khr_compressed_
>> astc-miptree-array.c
>> index 0cc0ec819..111855137 100644
>> --- a/tests/spec/khr_texture_compression_astc/khr_compressed_
>> astc-miptree-array.c
>> +++ b/tests/spec/khr_texture_compression_astc/khr_compressed_
>> astc-miptree-array.c
>> @@ -57,24 +57,27 @@ PIGLIT_GL_TEST_CONFIG_BEGIN
>>         config.window_width = 2 * level0_width;
>>         config.window_height = level0_height + (level0_height >> 1);
>>         config.window_visual = PIGLIT_GL_VISUAL_RGB |
>> PIGLIT_GL_VISUAL_DOUBLE;
>> -       static bool is_odd[2] = {true, false};
>> +       static bool is_odd[2] = { true, false };
>>
>> -       config.subtests = (struct piglit_subtest[]) {
>> +       struct piglit_subtest subtests[] =
>> +       {
>>                 {
>> -                       "5x5 Block Dim",
>> -                       "odd",
>> -                       test_miptrees,
>> -                       &is_odd[0]
>> +                       .name = "5x5 Block Dim",
>> +                       .option = "odd",
>> +                       .subtest_func = test_miptrees,
>> +                       .data = &is_odd[0]
>>                 },
>> +
>>                 {
>> -                       "12x12 Block Dim",
>> -                       "even",
>> -                       test_miptrees,
>> -                       &is_odd[1]
>> -               },
>> -               {NULL},
>> +                       .name = "12x12 Block Dim",
>> +                       .option = "even",
>> +                       .subtest_func = test_miptrees,
>> +                       .data = &is_odd[1]
>> +               }
>>         };
>>
>> +       config.subtests = subtests;
>> +
>>  PIGLIT_GL_TEST_CONFIG_END
>>
>>  /**
>> --
>> 2.11.0.windows.1
>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/piglit/attachments/20170720/8549e53f/attachment.html>