Merge branch 'master' into stash_glyphcache

Conflicts:
	make/scripts/tests.sh
	src/jogl/classes/com/jogamp/graph/curve/OutlineShape.java
	src/jogl/classes/com/jogamp/graph/curve/Region.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/GLRegion.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/RegionRenderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/Renderer.java
	src/jogl/classes/com/jogamp/graph/curve/opengl/TextRenderer.java
	src/jogl/classes/com/jogamp/graph/font/Font.java
	src/jogl/classes/com/jogamp/opengl/math/VectorUtil.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphShape.java
	src/jogl/classes/jogamp/graph/curve/text/GlyphString.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java
	src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java

1 files changed, 4 insertions, 52 deletions

diff --git a/make/config/jogl/gl-if-gl2_es2.cfg b/make/config/jogl/gl-if-gl2_es2.cfg
index 6a8aef06b..db5489d06 100644
--- a/make/config/jogl/gl-if-gl2_es2.cfg
+++ b/make/config/jogl/gl-if-gl2_es2.cfg
@@ -13,44 +13,11 @@ Extends GL2ES2 GL
 
 HierarchicalNativeOutput false
 Include gl-common.cfg
+Include gl-common-gpubufferonly.cfg
 Include gl-common-extensions.cfg
-Include gl-if-gl3-ignores.cfg
-Include gl-if-gl4-ignores.cfg
-
-RenameExtensionIntoCore GL_OES_texture_3D
-RenameExtensionIntoCore GL_OES_get_program_binary
-
-# Ignore all ES 2.X only stuff ..
-DropUniqVendorExtensions AMD
-DropUniqVendorExtensions ANGLE
-DropUniqVendorExtensions ARM
-DropUniqVendorExtensions APPLE
-DropUniqVendorExtensions ATI
-DropUniqVendorExtensions IMG
-DropUniqVendorExtensions QCOM
-DropUniqVendorExtensions NV
-DropUniqVendorExtensions VIV
-
-IgnoreExtension GL_EXT_discard_framebuffer
-IgnoreExtension GL_OES_compressed_paletted_texture
-IgnoreExtension GL_OES_compressed_ETC1_RGB8_texture
-IgnoreExtension GL_OES_vertex_array_object
-IgnoreExtension GL_OES_EGL_image_external
-IgnoreExtension GL_EXT_debug_marker
-IgnoreExtension GL_EXT_debug_label
-IgnoreExtension GL_EXT_multisampled_render_to_texture
-
-# isn't included in GL2
-# includes GL_STATE_RESTORE, which hasn't the QCOM suffix
-IgnoreExtension GL_QCOM_extended_get
-Ignore GL_STATE_RESTORE
-Ignore GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET
-
-# Ignore ^gl.*x(v)?(OES)?
-Ignore glEGL.*
-#Ignore glFramebufferVertexAttribArrayNV
-#Ignore glCoverageOperationNV
-#Ignore glCoverageMaskNV
+Include gl2_es2-common.cfg
+Include gl-if-gl2_es2-ignores.cfg
+Include gl-if-luminance-ignore.cfg
 
 # Ignore GL_ARB_ES2_compatibility functions for interface code generation
 # since we need our own javadoc header for a detailed description
@@ -60,9 +27,6 @@ Ignore glGetShaderPrecisionFormat
 Ignore glDepthRangef
 Ignore glClearDepthf
 
-CustomJavaCode GL2ES2 public void glClearDepth( double depth );
-CustomJavaCode GL2ES2 public void glDepthRange(double zNear, double zFar);
-
 IncludeAs CustomJavaCode GL2ES2 gl-if-CustomJavaCode-gl2_es2.java
 
 # dummy procaddress config / force procaddress for comments
@@ -71,20 +35,8 @@ ProcAddressTableClassName DontGenerateProcAddressTableStuff
 GetProcAddressTableExpr DontGenerateProcAddressTableStuff
 ForceProcAddressGen __ALL__
 
-# Inform the glue code generator of the association between #defines
-# and functions and the extensions in which they are defined
-# This also gives a better API doc since it includes all extension names.
-GLHeader GLES2/gl2.h
-GLHeader GLES2/gl2ext.h
-GLHeader GL/gl.h
-GLHeader GL/glext.h
-
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true
 
-CustomJavaCode GL2ES2  public void glVertexAttribPointer(GLArrayData array);
-CustomJavaCode GL2ES2  public void glUniform(GLUniformData data);
-CustomJavaCode GL2ES2
-
 Import java.io.PrintStream