aboutsummaryrefslogtreecommitdiffstats
path: root/src/mapi/es2api
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2018-10-11 14:46:34 +0100
committerEric Engestrom <[email protected]>2019-07-10 11:27:51 +0000
commit6f305d0c617d9bcfd7446554bc2ae8691b5b4d7a (patch)
treed6ecc25968768f235a2d272948da5bd720bcc960 /src/mapi/es2api
parent111c34d2aed03f60818ce8248e3b20de5f98d76b (diff)
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]>
Diffstat (limited to 'src/mapi/es2api')
-rw-r--r--[-rwxr-xr-x]src/mapi/es2api/gles2-symbols.txt (renamed from src/mapi/es2api/ABI-check)29
-rw-r--r--src/mapi/es2api/meson.build9
2 files changed, 7 insertions, 31 deletions
diff --git a/src/mapi/es2api/ABI-check b/src/mapi/es2api/gles2-symbols.txt
index e709c8c945c..92d8e9ac46a 100755..100644
--- 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