1 files changed, 3 insertions, 41 deletions
diff --git a/src/net/java/games/jogl/Animator.java b/src/net/java/games/jogl/Animator.java
index ebb6d9aed..06fb25cca 100644
--- a/src/net/java/games/jogl/Animator.java
+++ b/src/net/java/games/jogl/Animator.java
@@ -68,11 +68,6 @@ public class Animator {
   /** Creates a new Animator for a particular drawable. */
   public Animator(GLDrawable drawable) {
     this.drawable = drawable;
-
-    // Workaround for NVidia driver bug 80174
-    if (drawable instanceof GLCanvas) {
-      ((GLCanvas) drawable).willSetRenderingThread();
-    }
   }
 
   /** Starts this animator. */
@@ -85,23 +80,6 @@ public class Animator {
           public void run() {
             boolean noException = false;
             try {
-              // Try to get OpenGL context optimization since we know we
-              // will be rendering this one drawable continually from
-              // this thread; make the context current once instead of
-              // making it current and freeing it each frame.
-              drawable.setRenderingThread(Thread.currentThread());
-
-              // Since setRenderingThread is currently advisory (because
-              // of the poor JAWT implementation in the Motif AWT, which
-              // performs excessive locking) we also prevent repaint(),
-              // which is called from the AWT thread, from having an
-              // effect for better multithreading behavior. This call is
-              // not strictly necessary, but if end users write their
-              // own animation loops which update multiple drawables per
-              // tick then it may be necessary to enforce the order of
-              // updates.
-              drawable.setNoAutoRedrawMode(true);
-
               while (!shouldStop) {
                 noException = false;
                 drawable.display();
@@ -109,25 +87,9 @@ public class Animator {
               }
             } finally {
               shouldStop = false;
-              drawable.setNoAutoRedrawMode(false);
-              try {
-                // The surface is already unlocked and rendering
-                // thread is already null if an exception occurred
-                // during display(), so don't disable the rendering
-                // thread again.
-                if (noException) {
-                  // Destruction of the underlying GLContext may have
-                  // disabled the setRenderingThread optimization out
-                  // from under us
-                  if (drawable.getRenderingThread() != null) {
-                    drawable.setRenderingThread(null);
-                  }
-                }
-              } finally {
-                synchronized (Animator.this) {
-                  thread = null;
-                  Animator.this.notify();
-                }
+              synchronized (Animator.this) {
+                thread = null;
+                Animator.this.notify();
               }
             }
           }