[Mesa-dev] [PATCH 01/14] mesa: remove incorrect change for EXT_disjoint_timer_query

[Marek Olšák]

On Thu, Aug 9, 2018 at 1:47 AM, Tapani Pälli <tapani.palli at intel.com> wrote:
> Hi Marek;
>
> On 08/09/2018 02:55 AM, Marek Olšák wrote:
>>
>> From: Marek Olšák <marek.olsak at amd.com>
>>
>> ---
>>   src/mesa/main/queryobj.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
>> index 7547fa1bb4d..e97a0138e96 100644
>> --- a/src/mesa/main/queryobj.c
>> +++ b/src/mesa/main/queryobj.c
>> @@ -815,22 +815,21 @@ get_query_object(struct gl_context *ctx, const char
>> *func,
>>      if (_mesa_is_gles(ctx) &&
>>          (pname != GL_QUERY_RESULT && pname != GL_QUERY_RESULT_AVAILABLE))
>> {
>>         _mesa_error(ctx, GL_INVALID_ENUM, "%s(%s)", func,
>>                     _mesa_enum_to_string(pname));
>>         return;
>>      }
>>        if (buf && buf != ctx->Shared->NullBufferObj) {
>>         bool is_64bit = ptype == GL_INT64_ARB ||
>>            ptype == GL_UNSIGNED_INT64_ARB;
>> -      if (!ctx->Extensions.ARB_query_buffer_object &&
>> -          !ctx->Extensions.EXT_disjoint_timer_query) {
>> +      if (!ctx->Extensions.ARB_query_buffer_object) {
>>            _mesa_error(ctx, GL_INVALID_OPERATION, "%s(not supported)",
>> func);
>
>
> Can you explain what was the trouble with this change? I don't recall much
> why this particular change was added but the EXT_disjoint_timer_query spec
> adds support for int64 and uint64 GL types and params to be used in queries.
> I can run some tests to check this.

The conditional is in a block that is entered if a query buffer object
is bound. EXT_disjoint_timer_query doesn't support query buffer
objects. I don't see any connection with 64-bit types there.

Marek