gl4es updated, added latest changes by ptitSeb

project/jni/gl4es/spec/template/base/wrap.c.j2

@@ -3,7 +3,7 @@
 {% include "base/headers.j2" %}
 {% for func in functions %}
 {% block definition scoped %}
-{{ func.return }} glshim_{{ func.name }}({{ func.args|args }}) {
+{{ func.return }} gl4es_{{ func.name }}({{ func.args|args }}) {
     {% block load scoped %}{% endblock %}
     {% block call scoped %}
     {% if not func.void %}return {% endif %}{% block prefix %}wrap{% endblock %}_{{ func.name }}({{ func.args|args(0) }});

project/jni/gl4es/spec/template/gleswrap.c.j2

@@ -18,7 +18,7 @@
 #endif
 {% endblock %}
 {% block load %}
-    LOAD_GLES({{ func.name }});
+    {{ func.loadlib }}({{ func.name }});
 {% endblock %}
 {% block call %}
 #ifndef direct_{{ func.name }}

project/jni/gl4es/spec/template/glextwrap.c.j2

@@ -9,7 +9,7 @@
 #endif
 {% endblock %}
 {% block load %}
-    LOAD_GLES_OES({{ func.name }});
+    {{ func.loadlib }}({{ func.name }});
 {% endblock %}
 {% block call %}
 #ifndef direct_{{ func.name }}

project/jni/gl4es/spec/template/glwrap.h.j2

@@ -7,7 +7,7 @@
 #define push_{{ func.name }}({{ func.args|args(0) }}) { \
     {{ func.name }}_PACKED *packed_data = malloc(sizeof({{ func.name }}_PACKED)); \
     packed_data->format = {{ func.name }}_FORMAT; \
-    packed_data->func = glshim_{{ func.name }}; \
+    packed_data->func = gl4es_{{ func.name }}; \
     {% if func.args %}
     {% for arg in func.args %}
     packed_data->args.a{{ loop.index }} = ({{ arg.type|unconst }}){{ arg.name }}; \