From 959b38a08363b54de4e4d8dd723c1eac32cd7e26 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Sat, 5 Jan 2013 12:27:00 +0000
Subject: [PATCH] GL rendering context fix.

---
 .../opengl/juce_OpenGLGraphicsContext.cpp         | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
index 08f48b464a..ccd5863158 100644
--- a/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
+++ b/modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
@@ -734,7 +734,7 @@ struct StateHelpers
     struct ActiveTextures
     {
         ActiveTextures (const OpenGLContext& c) noexcept
-            : texturesEnabled (0), currentActiveTexture (0), context (c)
+            : texturesEnabled (0), currentActiveTexture (-1), context (c)
         {}
 
         void clear() noexcept
@@ -742,11 +742,6 @@ struct StateHelpers
             zeromem (currentTextureID, sizeof (currentTextureID));
         }
 
-        void clearCurrent() noexcept
-        {
-            currentTextureID [currentActiveTexture] = 0;
-        }
-
         template <class QuadQueueType>
         void setTexturesEnabled (QuadQueueType& quadQueue, const int textureIndexMask) noexcept
         {
@@ -826,6 +821,8 @@ struct StateHelpers
 
         void bindTexture (const GLuint textureID) noexcept
         {
+            jassert (currentActiveTexture >= 0);
+
             if (currentTextureID [currentActiveTexture] != textureID)
             {
                 currentTextureID [currentActiveTexture] = textureID;
@@ -875,12 +872,6 @@ struct StateHelpers
             return textures.removeAndReturn (0);
         }
 
-        void releaseTexture (ActiveTextures& activeTextures, OpenGLTexture* texture)
-        {
-            activeTextures.clearCurrent();
-            textures.add (texture);
-        }
-
         void resetGradient() noexcept
         {
             gradientNeedsRefresh = true;