From 230f5e58ca4dc343ec6b28c5f893b8e1d4656666 Mon Sep 17 00:00:00 2001
From: LaurentGom <LaurentGom@4e206d99-4929-0410-ac5d-dfc041789085>
Date: Tue, 9 Nov 2010 21:55:24 +0000
Subject: [PATCH] Fixed texture cache not properly updated when a same
 sf::Image instance allocated a new OpenGL texture internally

git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1631 4e206d99-4929-0410-ac5d-dfc041789085
---
 include/SFML/Graphics/Renderer.hpp | 7 +------
 src/SFML/Graphics/Renderer.cpp     | 9 ++-------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/include/SFML/Graphics/Renderer.hpp b/include/SFML/Graphics/Renderer.hpp
index ead24ca3..40a13b4e 100644
--- a/include/SFML/Graphics/Renderer.hpp
+++ b/include/SFML/Graphics/Renderer.hpp
@@ -70,12 +70,6 @@ public :
     ////////////////////////////////////////////////////////////
     Renderer(RenderTarget& target);
 
-    ////////////////////////////////////////////////////////////
-    /// \brief Destructor
-    ///
-    ////////////////////////////////////////////////////////////
-    ~Renderer();
-
     ////////////////////////////////////////////////////////////
     /// \brief Initialize the renderer (set the default states, etc.)
     ///
@@ -355,6 +349,7 @@ private :
     States        myStatesStack[64];  ///< Stack of render states
     States*       myStates;           ///< Current set of render states
     const Image*  myTexture;          ///< Current texture
+    unsigned int  myTextureId;        ///< Current texture identifier (the sf::Image instance may be the same, but not the internal OpenGL texture)
     const Shader* myShader;           ///< Current pixel shader
     Blend::Mode   myBlendMode;        ///< Current blending mode
     IntRect       myViewport;         ///< Current target viewport
diff --git a/src/SFML/Graphics/Renderer.cpp b/src/SFML/Graphics/Renderer.cpp
index a8480f60..117fcde1 100644
--- a/src/SFML/Graphics/Renderer.cpp
+++ b/src/SFML/Graphics/Renderer.cpp
@@ -46,12 +46,6 @@ myViewportIsValid (false)
 }
 
 
-////////////////////////////////////////////////////////////
-Renderer::~Renderer()
-{
-}
-
-
 ////////////////////////////////////////////////////////////
 void Renderer::Initialize()
 {
@@ -239,7 +233,7 @@ void Renderer::SetBlendMode(Blend::Mode mode)
 ////////////////////////////////////////////////////////////
 void Renderer::SetTexture(const Image* texture)
 {
-    if ((texture != myTexture) || !myTextureIsValid)
+    if ((texture != myTexture) || (texture && (texture->myTexture != myTextureId)) || !myTextureIsValid)
     {
         // Apply the new texture
         if (texture)
@@ -249,6 +243,7 @@ void Renderer::SetTexture(const Image* texture)
 
         // Store it
         myTexture = texture;
+        myTextureId = texture ? texture->myTexture : 0;
         myTextureIsValid = true;
     }
     else if (texture)