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

Eric Engestrom eric.engestrom at intel.com
Fri Nov 9 15:37:29 UTC 2018


On Friday, 2018-11-09 16:20:39 +0100, Erik Faye-Lund 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>

Thanks for the quick fix!
Reviewed-and-Tested-by: Eric Engestrom <eric.engestrom at intel.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


More information about the mesa-dev mailing list