From 618fa10949c42eb83fa5fe105fe542bcff833dda Mon Sep 17 00:00:00 2001 From: Mathias Agopian Date: Wed, 14 Oct 2009 02:06:37 -0700 Subject: fix [2187212] add support for GLESv2 dispatch based on TLS Instead of using a different function pointer table for ES 1.x and ES 2.x, we use a single one that is the union (sort|uniq) of both tables. Two instances of this table are initialized with pointers to GL ES 1.x and GL ES 2.x entry-points. When a context is created, we store its version number and when it is bound to a thread we set the approruiate table based on the stored version. This introduce no penalty while dispatching gl calls to the right API version. [Pending Dr No approval for MR1] --- opengl/libs/tools/genfiles | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'opengl/libs/tools/genfiles') diff --git a/opengl/libs/tools/genfiles b/opengl/libs/tools/genfiles index 4f8eda4..120cb4b 100755 --- a/opengl/libs/tools/genfiles +++ b/opengl/libs/tools/genfiles @@ -14,14 +14,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -./glapigen ../../include/GLES/gl.h > ../GLES_CM/gl_api.in -./glentrygen ../../include/GLES/gl.h > ../GLES_CM/gl_entries.in +./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/GLES2/gl2ext.h > ../GLES2/gl2ext_api.in -./glapigen ../../include/GLES/glext.h > ../GLES_CM/glext_api.in -./glentrygen ../../include/GLES/glext.h > ../GLES_CM/glext_entries.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/GLES2/gl2ext.h > /tmp/gl2ext_entries.in -./glapigen ../../include/GLES2/gl2.h > ../GLES2/gl2_api.in -./glentrygen ../../include/GLES2/gl2.h > ../GLES2/gl2_entries.in - -./glapigen ../../include/GLES2/gl2ext.h > ../GLES2/gl2ext_api.in -./glentrygen ../../include/GLES2/gl2ext.h > ../GLES2/gl2ext_entries.in +cat /tmp/gl_entries.in \ + /tmp/glext_entries.in \ + /tmp/gl2_entries.in \ + /tmp/gl2ext_entries.in \ + | sort -t, -k2 \ + | awk -F, '!_[$2]++' \ + > ../entries.in -- cgit v1.1