From c05d627cc196f928aecf4776d8fe0cbd71291599 Mon Sep 17 00:00:00 2001
From: Sam Gateau <sam@highfidelity.io>
Date: Fri, 23 Jan 2015 17:13:26 -0800
Subject: [PATCH] Clean up

---
 libraries/render-utils/src/TextureCache.cpp | 12 ++++++++----
 libraries/render-utils/src/TextureCache.h   |  3 +--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libraries/render-utils/src/TextureCache.cpp b/libraries/render-utils/src/TextureCache.cpp
index a27d9f0e5e..8ac53cec2e 100644
--- a/libraries/render-utils/src/TextureCache.cpp
+++ b/libraries/render-utils/src/TextureCache.cpp
@@ -25,6 +25,8 @@
 
 #include "TextureCache.h"
 
+#include "gpu/GLBackend.h"
+
 TextureCache::TextureCache() :
     _permutationNormalTexture(0),
     _whiteTexture(0),
@@ -366,11 +368,13 @@ QOpenGLFramebufferObject* TextureCache::createFramebufferObject() {
 }
 
 Texture::Texture() {
-    glGenTextures(1, &_id);
 }
 
 Texture::~Texture() {
-    glDeleteTextures(1, &_id);
+}
+
+GLuint Texture::getID() const {
+    return gpu::GLBackend::getTextureID(_gpuTexture);
 }
 
 NetworkTexture::NetworkTexture(const QUrl& url, TextureType type, const QByteArray& content) :
@@ -385,7 +389,7 @@ NetworkTexture::NetworkTexture(const QUrl& url, TextureType type, const QByteArr
     }
     
     // default to white/blue/black
-    glBindTexture(GL_TEXTURE_2D, getID());
+  /*  glBindTexture(GL_TEXTURE_2D, getID());
     switch (type) {
         case NORMAL_TEXTURE:
             loadSingleColorTexture(OPAQUE_BLUE);  
@@ -404,7 +408,7 @@ NetworkTexture::NetworkTexture(const QUrl& url, TextureType type, const QByteArr
             break;
     }
     glBindTexture(GL_TEXTURE_2D, 0);
-    
+    */
     // if we have content, load it after we have our self pointer
     if (!content.isEmpty()) {
         _startedLoading = true;
diff --git a/libraries/render-utils/src/TextureCache.h b/libraries/render-utils/src/TextureCache.h
index 4754991a11..5393a1c211 100644
--- a/libraries/render-utils/src/TextureCache.h
+++ b/libraries/render-utils/src/TextureCache.h
@@ -130,7 +130,7 @@ public:
     Texture();
     ~Texture();
 
-    GLuint getID() const { return _id; }
+    GLuint getID() const;
 
     const gpu::TexturePointer& getGPUTexture() const { return _gpuTexture; }
 
@@ -138,7 +138,6 @@ protected:
     gpu::TexturePointer _gpuTexture;
 
 private:
-    GLuint _id;
 };
 
 /// A texture loaded from the network.