diff options
| author | Jesse Hall <jessehall@google.com> | 2014-05-13 16:48:35 -0700 |
|---|---|---|
| committer | Jesse Hall <jessehall@google.com> | 2014-05-17 19:31:48 -0700 |
| commit | 4c0596f4cc7d3a0bbbe5862cb38585a58ef4d0a3 (patch) | |
| tree | 8c7666603fb21e96b137d14c98e77f66328e341c /opengl/libs/tools | |
| parent | 6b4e02f1cbdc55126cae9d2ce588640a784e7d61 (diff) | |
| download | frameworks_native-4c0596f4cc7d3a0bbbe5862cb38585a58ef4d0a3.zip frameworks_native-4c0596f4cc7d3a0bbbe5862cb38585a58ef4d0a3.tar.gz frameworks_native-4c0596f4cc7d3a0bbbe5862cb38585a58ef4d0a3.tar.bz2 | |
Rationalize GLES2/3 .in files.
We weren't using gl2_api.in, since gl3_api.in was a superset. And
gl3ext_api.in was empty, and Khronos has decided to keep it that way
(any GLES2/3/... extensions will be in gl2ext.h).
Since libGLES2.so will have all future backwards-compatible GLES APIs,
it makes sense to just use gl2_api.in and gl2ext_api.in to build its
contents. This changes renames gl3_api.in to gl2_api.in and updates
uses of it, and removes gl3ext_api.in and references.
Bug: 15028495
Change-Id: I0745eda27ec91ee625f03e957e4fdb22035dd781
Diffstat (limited to 'opengl/libs/tools')
| -rwxr-xr-x | opengl/libs/tools/genfiles | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/opengl/libs/tools/genfiles b/opengl/libs/tools/genfiles index f92c9ab..a4a1958 100755 --- a/opengl/libs/tools/genfiles +++ b/opengl/libs/tools/genfiles @@ -20,17 +20,13 @@ export LC_ALL=POSIX ./glapigen ../../include/GLES/gl.h > ../GLES_CM/gl_api.in ./glapigen ../../include/GLES/glext.h > ../GLES_CM/glext_api.in -./glapigen ../../include/GLES2/gl2.h > ../GLES2/gl2_api.in +./glapigen ../../include/GLES3/gl3.h > ../GLES2/gl2_api.in ./glapigen ../../include/GLES2/gl2ext.h > ../GLES2/gl2ext_api.in -./glapigen ../../include/GLES3/gl3.h > ../GLES2/gl3_api.in -./glapigen ../../include/GLES3/gl3ext.h > ../GLES2/gl3ext_api.in ./glentrygen ../../include/GLES/gl.h > /tmp/gl_entries.in ./glentrygen ../../include/GLES/glext.h > /tmp/glext_entries.in -./glentrygen ../../include/GLES2/gl2.h > /tmp/gl2_entries.in +./glentrygen ../../include/GLES3/gl3.h > /tmp/gl2_entries.in ./glentrygen ../../include/GLES2/gl2ext.h > /tmp/gl2ext_entries.in -./glentrygen ../../include/GLES3/gl3.h > /tmp/gl3_entries.in -./glentrygen ../../include/GLES3/gl3ext.h > /tmp/gl3ext_entries.in # The awk command removes lines with the same function name as an earlier # line, even if the rest of the line differs. Although signatures of @@ -40,8 +36,6 @@ cat /tmp/gl_entries.in \ /tmp/glext_entries.in \ /tmp/gl2_entries.in \ /tmp/gl2ext_entries.in \ - /tmp/gl3_entries.in \ - /tmp/gl3ext_entries.in \ | sort -t, -k2 \ | awk -F, '!_[$2]++' \ > ../entries.in @@ -50,10 +44,8 @@ cat /tmp/gl_entries.in \ cat ../../include/GLES/gl.h \ ../../include/GLES/glext.h \ - ../../include/GLES2/gl2.h \ ../../include/GLES2/gl2ext.h \ ../../include/GLES3/gl3.h \ - ../../include/GLES3/gl3ext.h \ | ./glenumsgen \ | sort \ > ../enums.in |