Module: Mesa Branch: master Commit: 6f305d0c617d9bcfd7446554bc2ae8691b5b4d7a URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6f305d0c617d9bcfd7446554bc2ae8691b5b4d7a
Author: Eric Engestrom <[email protected]> Date: Thu Oct 11 14:46:34 2018 +0100 gles: use new symbols check script Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by Dylan Baker <[email protected]> Reviewed-by: Emil Velikov <[email protected]> --- src/mapi/es1api/{ABI-check => gles1-symbols.txt} | 29 +----------------------- src/mapi/es1api/meson.build | 9 +++++--- src/mapi/es2api/{ABI-check => gles2-symbols.txt} | 29 +----------------------- src/mapi/es2api/meson.build | 9 +++++--- 4 files changed, 14 insertions(+), 62 deletions(-) diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/gles1-symbols.txt old mode 100755 new mode 100644 similarity index 81% rename from src/mapi/es1api/ABI-check rename to src/mapi/es1api/gles1-symbols.txt index e9a2cb2bde2..935b9d583da --- a/src/mapi/es1api/ABI-check +++ b/src/mapi/es1api/gles1-symbols.txt @@ -1,29 +1,7 @@ -#!/bin/sh -set -eu - -# Print defined gl.* functions not in GL ES 1.1 +# gl.* functions in GL ES 1.1 # or in extensions that are part of the ES 1.1 extension pack. # (see http://www.khronos.org/registry/gles/specs/1.1/opengles_spec_1_1_extension_pack.pdf) -case "$(uname)" in -Darwin) - LIB=${1-es1api/.libs/libGLESv1_CM.dylib} - ;; -CYGWIN*) - LIB=${1-es1api/.libs/cygGLESv1_CM-1.dll} - ;; -*) - LIB=${1-es1api/.libs/libGLESv1_CM.so.1} - ;; -esac - -if ! [ -f "$LIB" ] -then - exit 1 -fi - -FUNCS=$($NM -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read func; do -( grep -q "^$func$" || echo $func ) <<EOF glActiveTexture glAlphaFunc glAlphaFuncx @@ -169,8 +147,3 @@ glTranslatef glTranslatex glVertexPointer glViewport -EOF -done) - -test ! -n "$FUNCS" || echo $FUNCS -test ! -n "$FUNCS" diff --git a/src/mapi/es1api/meson.build b/src/mapi/es1api/meson.build index 53bdc16d946..150f62f46d1 100644 --- a/src/mapi/es1api/meson.build +++ b/src/mapi/es1api/meson.build @@ -55,9 +55,12 @@ pkg.generate( if with_tests and prog_nm.found() test( 'es1-ABI-check', - find_program('ABI-check'), - env : env_test, - args : libglesv1_cm, + symbols_check, + args : [ + '--lib', libglesv1_cm, + '--symbols-file', files('gles1-symbols.txt'), + '--nm', prog_nm.path(), + ], suite : ['mapi'], ) endif diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/gles2-symbols.txt old mode 100755 new mode 100644 similarity index 93% rename from src/mapi/es2api/ABI-check rename to src/mapi/es2api/gles2-symbols.txt index e709c8c945c..92d8e9ac46a --- a/src/mapi/es2api/ABI-check +++ b/src/mapi/es2api/gles2-symbols.txt @@ -1,27 +1,5 @@ -#!/bin/sh -set -eu +# gl.* functions in GL ES 2 and 3.{0..2} -# Print defined gl.* functions not in GL ES 3.{0..2} - -case "$(uname)" in -Darwin) - LIB=${1-es2api/.libs/libGLESv2.dylib} - ;; -CYGWIN*) - LIB=${1-es2api/.libs/cygGLESv2-2.dll} - ;; -*) - LIB=${1-es2api/.libs/libGLESv2.so.2} - ;; -esac - -if ! [ -f "$LIB" ] -then - exit 1 -fi - -FUNCS=$($NM -D --defined-only $LIB | grep -o 'T gl.*' | cut -c 3- | while read func; do -( grep -q "^$func$" || echo $func ) <<EOF glActiveShaderProgram glActiveTexture glAttachShader @@ -380,8 +358,3 @@ glVertexAttribPointer glVertexBindingDivisor glViewport glWaitSync -EOF -done) - -test ! -n "$FUNCS" || echo $FUNCS -test ! -n "$FUNCS" diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build index d374bd80849..97e4ad25de6 100644 --- a/src/mapi/es2api/meson.build +++ b/src/mapi/es2api/meson.build @@ -55,9 +55,12 @@ pkg.generate( if with_tests and prog_nm.found() test( 'es2-ABI-check', - find_program('ABI-check'), - env : env_test, - args : libgles2, + symbols_check, + args : [ + '--lib', libgles2, + '--symbols-file', files('gles2-symbols.txt'), + '--nm', prog_nm.path(), + ], suite : ['mapi'], ) endif _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
