[Mesa-dev] [PATCH] mesa/main: fixup make check after NV_conditional_render for gles

[Erik Faye-Lund]

On Fri, 2018-11-09 at 10:44 -0500, Ilia Mirkin wrote:
> Errr ... why are these being added to the ABI now? Extensions are
> generally not added in. Some are grandfathered in, but this one would
> be new.
> 
> Or is this due to the fact that it's grandfathered in for GL, and
> making that and GLES different would be tricky?

I'm not sure, really. This feature missed the 18.3 release anyway, so
we have time to fix this up, if anyone knows for sure.

I don't think there's a good reason to cement this in the GLES ABI, so
I think we should remove it, if that's possible. I don't really know
what makes this appear in the ABI, though. If someone can explain, I'd
be happy to fix things up.

Anyway, I pushed the test-fixes for now; the ABI change seems to
already have happened.

> On Fri, Nov 9, 2018 at 10:20 AM Erik Faye-Lund
> <erik.faye-lund at collabora.com> wrote:
> > It seems I missed some details when exposing NV_conditional_render
> > on GLES; this fixes up "make check".
> > 
> > Fixes: 5213be9fab7 ("mesa: expose NV_conditional_render on GLES")
> > Signed-off-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
> > ---
> > Caught by the Intel CI system. Sorry about this!
> > 
> >  src/mapi/es2api/ABI-check               | 2 ++
> >  src/mesa/main/tests/dispatch_sanity.cpp | 4 ++++
> >  2 files changed, 6 insertions(+)
> > 
> > diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/ABI-check
> > index a04b03d7d60..8f601a0603c 100755
> > --- a/src/mapi/es2api/ABI-check
> > +++ b/src/mapi/es2api/ABI-check
> > @@ -28,6 +28,7 @@ FUNCS=$($NM -D --defined-only $LIB | grep -o 'T
> > gl.*' | cut -c 3- | while read f
> >  glActiveShaderProgram
> >  glActiveTexture
> >  glAttachShader
> > +glBeginConditionalRenderNV
> >  glBeginQuery
> >  glBeginTransformFeedback
> >  glBindAttribLocation
> > @@ -123,6 +124,7 @@ glEGLImageTargetTexture2DOES
> >  glEnable
> >  glEnableVertexAttribArray
> >  glEnablei
> > +glEndConditionalRenderNV
> >  glEndQuery
> >  glEndTransformFeedback
> >  glFenceSync
> > diff --git a/src/mesa/main/tests/dispatch_sanity.cpp
> > b/src/mesa/main/tests/dispatch_sanity.cpp
> > index fb2acfbdeea..c5d75f9683e 100644
> > --- a/src/mesa/main/tests/dispatch_sanity.cpp
> > +++ b/src/mesa/main/tests/dispatch_sanity.cpp
> > @@ -2236,6 +2236,10 @@ const struct function
> > gles2_functions_possible[] = {
> >     /* GL_NV_conservative_raster_pre_snap_triangles */
> >     { "glConservativeRasterParameteriNV", 20, -1 },
> > 
> > +   /* GL_NV_conditional_render */
> > +   { "glBeginConditionalRenderNV", 20, -1 },
> > +   { "glEndConditionalRenderNV", 20, -1 },
> > +
> >     { NULL, 0, -1 }
> >  };
> > 
> > --
> > 2.19.1
> > 
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev