From 71b8203572bc1bd63540818a9de4f927b0abebb1 Mon Sep 17 00:00:00 2001
From: Sven Gothel
+ * Support for {@link GL4#GL_TESS_CONTROL_SHADER} and {@link GL4#GL_TESS_EVALUATION_SHADER} + * was added since 2.2.1. + *
*/ public class ShaderCode { public static final boolean DEBUG_CODE = Debug.isPropertyDefined("jogl.debug.GLSLCode", true); @@ -80,16 +84,28 @@ public class ShaderCode { /** Unique resource suffix for {@link GL3#GL_GEOMETRY_SHADER} in binary:{@value}
*/
public static final String SUFFIX_GEOMETRY_BINARY = "bgp" ;
- /** Unique resource suffix for {@link GL4#GL_TESS_CONTROL_SHADER} in source code: {@value}
*/
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_CONTROL_SHADER} in source code: {@value}
+ * @since 2.2.1
+ */
public static final String SUFFIX_TESS_CONTROL_SOURCE = "tcp" ;
- /** Unique resource suffix for {@link GL4#GL_TESS_CONTROL_SHADER} in binary: {@value}
*/
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_CONTROL_SHADER} in binary: {@value}
+ * @since 2.2.1
+ */
public static final String SUFFIX_TESS_CONTROL_BINARY = "btcp" ;
- /** Unique resource suffix for {@link GL4#GL_TESS_EVALUATION_SHADER} in source code: {@value}
*/
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_EVALUATION_SHADER} in source code: {@value}
+ * @since 2.2.1
+ */
public static final String SUFFIX_TESS_EVALUATION_SOURCE = "tep" ;
- /** Unique resource suffix for {@link GL4#GL_TESS_EVALUATION_SHADER} in binary: {@value}
*/
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_EVALUATION_SHADER} in binary: {@value}
+ * @since 2.2.1
+ */
public static final String SUFFIX_TESS_EVALUATION_BINARY = "btep" ;
/** Unique resource suffix for {@link GL2ES2#GL_FRAGMENT_SHADER} in source code: {@value}
*/
diff --git a/src/jogl/classes/javax/media/opengl/GLContext.java b/src/jogl/classes/javax/media/opengl/GLContext.java
index 8617df95c..6334c35d0 100644
--- a/src/jogl/classes/javax/media/opengl/GLContext.java
+++ b/src/jogl/classes/javax/media/opengl/GLContext.java
@@ -257,6 +257,7 @@ public abstract class GLContext {
* * Returns this GLContext, if it is a shared master. *
+ * @since 2.2.1 */ public final GLContext getSharedMaster() { return GLContextShareSet.getSharedMaster(this); -- cgit v1.2.3