[Mesa-dev] [PATCH 07/65] mesa/multisample: Check sample count using the new driver hook

[Eduardo Lima Mitev]

On 03/02/2016 04:35 PM, Matt Turner wrote:
> On Wed, Feb 3, 2016 at 7:44 AM, Eduardo Lima Mitev <elima at igalia.com> wrote:
>> Use QueryInternalFormat instead of QuerySamplesForFormat to obtain the
>> highest supported sample. QuerySamplesForFormat is to be removed.
>> ---
>>   src/mesa/main/multisample.c | 10 ++++++----
>>   1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
>> index e7783ea..56aa5c3 100644
>> --- a/src/mesa/main/multisample.c
>> +++ b/src/mesa/main/multisample.c
>> @@ -174,10 +174,12 @@ _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
>>       * for <internalformat> then the error INVALID_OPERATION is generated."
>>       */
>>      if (ctx->Extensions.ARB_internalformat_query) {
>> -      GLint buffer[16];
>> -      int count = ctx->Driver.QuerySamplesForFormat(ctx, target,
>> -                                                    internalFormat, buffer);
>> -      int limit = count ? buffer[0] : -1;
>> +      GLint buffer[16] = {-1};
>> +      ctx->Driver.QueryInternalFormat(ctx, target, internalFormat,
>> +                                      GL_SAMPLES, buffer);
>> +      /* since the query returns samples sorted in descending order,
>> +       * the first element is the greatest supported sample value */
>
> */ goes on its own line in multiline comments in Mesa.
>

Oops, that slipped twice, embarrassing!

Fixed locally, thanks Matt.

https://github.com/Igalia/mesa/commit/5740a63c482bacdf53900666a5a5e524c776d53d

Eduardo