aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-09-03 23:25:52 +0200
committerSven Gothel <[email protected]>2014-09-03 23:25:52 +0200
commit71b8203572bc1bd63540818a9de4f927b0abebb1 (patch)
tree2101c4fddda8f9c50c5a83697805b5ecc36fea4e /src
parentffde09410fb78c43bd45d6c5e62606789dced6eb (diff)
Adding missing '@since 2.2.1' tags to ShaderCode and GLContext
Diffstat (limited to 'src')
-rw-r--r--src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java24
-rw-r--r--src/jogl/classes/javax/media/opengl/GLContext.java1
2 files changed, 21 insertions, 4 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
index f9f3b845f..6c507d209 100644
--- a/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
+++ b/src/jogl/classes/com/jogamp/opengl/util/glsl/ShaderCode.java
@@ -64,6 +64,10 @@ import com.jogamp.common.util.VersionNumber;
* {@link #create(GL2ES2, int, Class, String, String, String, boolean) here} and
* {@link #create(GL2ES2, int, int, Class, String, String[], String, String) here}.
* </p>
+ * <p>
+ * Support for {@link GL4#GL_TESS_CONTROL_SHADER} and {@link GL4#GL_TESS_EVALUATION_SHADER}
+ * was added since 2.2.1.
+ * </p>
*/
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: <code>{@value}</code> */
public static final String SUFFIX_GEOMETRY_BINARY = "bgp" ;
- /** Unique resource suffix for {@link GL4#GL_TESS_CONTROL_SHADER} in source code: <code>{@value}</code> */
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_CONTROL_SHADER} in source code: <code>{@value}</code>
+ * @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: <code>{@value}</code> */
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_CONTROL_SHADER} in binary: <code>{@value}</code>
+ * @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: <code>{@value}</code> */
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_EVALUATION_SHADER} in source code: <code>{@value}</code>
+ * @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: <code>{@value}</code> */
+ /**
+ * Unique resource suffix for {@link GL4#GL_TESS_EVALUATION_SHADER} in binary: <code>{@value}</code>
+ * @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: <code>{@value}</code> */
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 {
* <p>
* Returns this GLContext, if it is a shared master.
* </p>
+ * @since 2.2.1
*/
public final GLContext getSharedMaster() {
return GLContextShareSet.getSharedMaster(this);