summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-12-06 20:24:26 +0100
committerSven Gothel <[email protected]>2014-12-06 20:24:26 +0100
commitdd56549ebb7400f40f973473760b5f53a8609cd0 (patch)
tree28cc5475b92172cbb58794bf12c46f81536e22e4
parent74fe4c340162e973e86c0e405de915cea8c72ec4 (diff)
Minor Cleanup (FBObject, GLBase)
FBObject: Remove redudant case GLBase: Add API doc reference to GLContext implementation
-rw-r--r--src/jogl/classes/com/jogamp/opengl/FBObject.java5
-rw-r--r--src/jogl/classes/javax/media/opengl/GLBase.java12
2 files changed, 13 insertions, 4 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/FBObject.java b/src/jogl/classes/com/jogamp/opengl/FBObject.java
index 20e576716..bb96f2721 100644
--- a/src/jogl/classes/com/jogamp/opengl/FBObject.java
+++ b/src/jogl/classes/com/jogamp/opengl/FBObject.java
@@ -699,10 +699,7 @@ public class FBObject {
final int magFilter, final int minFilter, final int wrapS, final int wrapT) {
final int dataFormat, dataType;
final boolean alpha = hasAlpha(internalFormat);
- if( gl.isGLES3() ) {
- dataFormat = alpha ? GL.GL_RGBA : GL.GL_RGB;
- dataType = GL.GL_UNSIGNED_BYTE;
- } else if( gl.isGLES() ) {
+ if( gl.isGLES() ) {
dataFormat = alpha ? GL.GL_RGBA : GL.GL_RGB;
dataType = GL.GL_UNSIGNED_BYTE;
} else {
diff --git a/src/jogl/classes/javax/media/opengl/GLBase.java b/src/jogl/classes/javax/media/opengl/GLBase.java
index 48455c525..802da3b6c 100644
--- a/src/jogl/classes/javax/media/opengl/GLBase.java
+++ b/src/jogl/classes/javax/media/opengl/GLBase.java
@@ -584,6 +584,9 @@ public interface GLBase {
/**
* Return the framebuffer name bound to this context,
* see {@link GL#glBindFramebuffer(int, int)}.
+ * <p>
+ * Calls {@link GLContext#getBoundFramebuffer(int)}.
+ * </p>
*/
public int getBoundFramebuffer(int target);
@@ -594,6 +597,9 @@ public interface GLBase {
* in case an framebuffer object ({@link com.jogamp.opengl.FBObject}) based drawable
* is being used.
* </p>
+ * <p>
+ * Calls {@link GLContext#getDefaultDrawFramebuffer()}.
+ * </p>
*/
public int getDefaultDrawFramebuffer();
@@ -604,6 +610,9 @@ public interface GLBase {
* in case an framebuffer object ({@link com.jogamp.opengl.FBObject}) based drawable
* is being used.
* </p>
+ * <p>
+ * Calls {@link GLContext#getDefaultReadFramebuffer()}.
+ * </p>
*/
public int getDefaultReadFramebuffer();
@@ -628,6 +637,9 @@ public interface GLBase {
* Note-3: See {@link com.jogamp.opengl.util.GLDrawableUtil#swapBuffersBeforeRead(GLCapabilitiesImmutable) swapBuffersBeforeRead}
* for read-pixels and swap-buffers implications.
* </p>
+ * <p>
+ * Calls {@link GLContext#getDefaultReadBuffer()}.
+ * </p>
*/
public int getDefaultReadBuffer();
}