summaryrefslogtreecommitdiff
path: root/src/mapi/es1api
diff options
context:
space:
mode:
authorEric Engestrom <eric.engestrom@intel.com>2018-10-11 14:46:34 +0100
committerEric Engestrom <eric@engestrom.ch>2019-07-10 11:27:51 +0000
commit6f305d0c617d9bcfd7446554bc2ae8691b5b4d7a (patch)
treed6ecc25968768f235a2d272948da5bd720bcc960 /src/mapi/es1api
parent111c34d2aed03f60818ce8248e3b20de5f98d76b (diff)
gles: use new symbols check script
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Reviewed-by Dylan Baker <dylan@pnwbakers.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Diffstat (limited to 'src/mapi/es1api')
-rw-r--r--[-rwxr-xr-x]src/mapi/es1api/gles1-symbols.txt (renamed from src/mapi/es1api/ABI-check)29
-rw-r--r--src/mapi/es1api/meson.build9
2 files changed, 7 insertions, 31 deletions
diff --git a/src/mapi/es1api/ABI-check b/src/mapi/es1api/gles1-symbols.txt
index e9a2cb2bde2..935b9d583da 100755..100644
--- 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