[Mesa-dev] [PATCH v4 1/6] mesa: add ARB_conditional_render_inverted flags

[Ilia Mirkin]

On Mon, Aug 18, 2014 at 7:56 PM, Roland Scheidegger <sroland at vmware.com> wrote:
> Series looks good to me too, just one minor nitpick below, otherwise
> 1-4, and 6 are
> Reviewed-by: Roland Scheidegger <sroland at vmware.com>

Thanks Roland. I've pushed these out, with ChrisF's r-b on 1 as well.
(And an additional patch to glapi... oops.)

>
> Am 19.08.2014 00:06, schrieb Tobias Klausmann:
>> Also add an extension bit so we can safely enable
>>
>> Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de>
>> ---
>>  src/mesa/main/condrender.c | 10 ++++++++--
>>  src/mesa/main/extensions.c |  1 +
>>  src/mesa/main/mtypes.h     |  1 +
>>  3 files changed, 10 insertions(+), 2 deletions(-)
>>
>> diff --git a/src/mesa/main/condrender.c b/src/mesa/main/condrender.c
>> index 0ad1e5c2..90ae566 100644
>> --- a/src/mesa/main/condrender.c
>> +++ b/src/mesa/main/condrender.c
>> @@ -77,8 +77,14 @@ _mesa_BeginConditionalRender(GLuint queryId, GLenum mode)
>>     case GL_QUERY_NO_WAIT:
>>     case GL_QUERY_BY_REGION_WAIT:
>>     case GL_QUERY_BY_REGION_NO_WAIT:
>> -      /* OK */
>> -      break;
>> +      break; /* OK */
>> +   case GL_QUERY_WAIT_INVERTED:
>> +   case GL_QUERY_NO_WAIT_INVERTED:
>> +   case GL_QUERY_BY_REGION_WAIT_INVERTED:
>> +   case GL_QUERY_BY_REGION_NO_WAIT_INVERTED:
>> +   if (ctx->Extensions.ARB_conditional_render_inverted)
>> +      break; /* OK */
> The indentation here for the if and break isn't right.
>
>> +    /* fallthrough - invalid */
>>     default:
>>        _mesa_error(ctx, GL_INVALID_ENUM, "glBeginConditionalRender(mode=%s)",
>>                    _mesa_lookup_enum_by_nr(mode));
>> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
>> index c5bd7b3..553c01e 100644
>> --- a/src/mesa/main/extensions.c
>> +++ b/src/mesa/main/extensions.c
>> @@ -94,6 +94,7 @@ static const struct extension extension_table[] = {
>>     { "GL_ARB_color_buffer_float",                  o(ARB_color_buffer_float),                  GL,             2004 },
>>     { "GL_ARB_compressed_texture_pixel_storage",    o(dummy_true),                              GL,             2011 },
>>     { "GL_ARB_compute_shader",                      o(ARB_compute_shader),                      GL,             2012 },
>> +   { "GL_ARB_conditional_render_inverted",         o(ARB_conditional_render_inverted),         GL,             2014 },
>>     { "GL_ARB_copy_buffer",                         o(dummy_true),                              GL,             2008 },
>>     { "GL_ARB_copy_image",                          o(ARB_copy_image),                          GL,             2012 },
>>     { "GL_ARB_conservative_depth",                  o(ARB_conservative_depth),                  GL,             2011 },
>> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
>> index 97b1ad2..cb2a4df 100644
>> --- a/src/mesa/main/mtypes.h
>> +++ b/src/mesa/main/mtypes.h
>> @@ -3553,6 +3553,7 @@ struct gl_extensions
>>     GLboolean ARB_clear_texture;
>>     GLboolean ARB_color_buffer_float;
>>     GLboolean ARB_compute_shader;
>> +   GLboolean ARB_conditional_render_inverted;
>>     GLboolean ARB_conservative_depth;
>>     GLboolean ARB_copy_image;
>>     GLboolean ARB_depth_buffer_float;
>>
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev