From 285bd9b718621a70f180dff6dfea73092c2b75cc Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 27 Sep 2012 17:38:01 +0200
Subject: FBObject: Clarify reset(..), resetSamplingSink(..) ; Rename
 syncFramebuffer(..) -> syncSamplingSink(..)

- reset(..) adds a new argument, boolean resetSamplingSink, allowing to trigger a reset
on the samplink sink as well. Use cases are documented.

- made public: resetSamplingSink()

- Rename syncFramebuffer(..) -> syncSamplingSink(..) to clarify semantics
---
 src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/jogl/classes/jogamp/opengl')

diff --git a/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java b/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java
index d7de7ca50..503b70af7 100644
--- a/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java
+++ b/src/jogl/classes/jogamp/opengl/GLFBODrawableImpl.java
@@ -102,7 +102,7 @@ public class GLFBODrawableImpl extends GLDrawableImpl implements GLFBODrawable {
             
             for(int i=0; i<fbosN; i++) {
                 fbos[i] = new FBObject();
-                fbos[i].reset(gl, getWidth(), getHeight(), samples);
+                fbos[i].reset(gl, getWidth(), getHeight(), samples, false);
                 if(fbos[i].getNumSamples() != samples) {
                     throw new InternalError("Sample number mismatch: "+samples+", fbos["+i+"] "+fbos[i]);
                 }
@@ -117,7 +117,7 @@ public class GLFBODrawableImpl extends GLDrawableImpl implements GLFBODrawable {
                     fbos[i].attachRenderbuffer(gl, Attachment.Type.DEPTH, 24);
                 }
             }
-            fbos[fboIFront].syncFramebuffer(gl);
+            fbos[fboIFront].resetSamplingSink(gl);
             fboBound = false;
             final GLCapabilities fboCapsNative = (GLCapabilities) surface.getGraphicsConfiguration().getChosenCapabilities();
             fbos[0].formatToGLCapabilities(fboCapsNative);
@@ -148,14 +148,14 @@ public class GLFBODrawableImpl extends GLDrawableImpl implements GLFBODrawable {
     
     private final void reset(GL gl, int idx, int width, int height, int samples, int alphaBits, int stencilBits) {
         if( !FBOResetQuirk ) {
-            fbos[idx].reset(gl, width, height, samples); // implicit glClear(..)
+            fbos[idx].reset(gl, width, height, samples, false);
             if(fbos[idx].getNumSamples() != samples) {
                 throw new InternalError("Sample number mismatch: "+samples+", fbos["+idx+"] "+fbos[idx]);
             }
         } else {
             fbos[idx].destroy(gl);
             fbos[idx] = new FBObject();
-            fbos[idx].reset(gl, getWidth(), getHeight(), samples);
+            fbos[idx].reset(gl, getWidth(), getHeight(), samples, false);
             if(fbos[idx].getNumSamples() != samples) {
                 throw new InternalError("Sample number mismatch: "+samples+", fbos["+idx+"] "+fbos[idx]);
             }
-- 
cgit v1.2.3