From ec7f7de5c4ed6006c9936cf2eaf72a88707b6cbb Mon Sep 17 00:00:00 2001
From: Lauren Budorick <lauren@mapbox.com>
Date: Thu, 7 Aug 2014 12:49:04 -0700
Subject: still not working

---
 include/mbgl/map/map.hpp                      | 1 -
 include/mbgl/renderer/prerendered_texture.hpp | 1 +
 include/mbgl/renderer/raster_bucket.hpp       | 5 ++++-
 include/mbgl/util/raster.hpp                  | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp
index c54b40d752..9147d6f5b5 100644
--- a/include/mbgl/map/map.hpp
+++ b/include/mbgl/map/map.hpp
@@ -141,7 +141,6 @@ private:
 
     void updateTiles();
     void updateRenderState();
-    void updateRenderState(const mat4 vtxMatrix);
 
     size_t countLayers(const std::vector<LayerDescription>& layers);
 
diff --git a/include/mbgl/renderer/prerendered_texture.hpp b/include/mbgl/renderer/prerendered_texture.hpp
index 4a5b736d4f..e4dc610418 100644
--- a/include/mbgl/renderer/prerendered_texture.hpp
+++ b/include/mbgl/renderer/prerendered_texture.hpp
@@ -29,6 +29,7 @@ private:
     GLint previous_fbo = 0;
     GLuint fbo = 0;
     GLuint texture = 0;
+    GLuint fbo_depth_stencil = 0;
 };
 
 }
diff --git a/include/mbgl/renderer/raster_bucket.hpp b/include/mbgl/renderer/raster_bucket.hpp
index 631fb3471b..4eccb22bd4 100644
--- a/include/mbgl/renderer/raster_bucket.hpp
+++ b/include/mbgl/renderer/raster_bucket.hpp
@@ -28,8 +28,11 @@ public:
 
     void drawRaster(RasterShader& shader, VertexBuffer &vertices, VertexArrayObject &array);
 
-private:
+    void drawRaster(RasterShader& shader, VertexBuffer &vertices, VertexArrayObject &array, GLuint texture);
+    
     Raster raster;
+
+private:
 };
 
 }
diff --git a/include/mbgl/util/raster.hpp b/include/mbgl/util/raster.hpp
index 04c85169e2..9124f59ba7 100644
--- a/include/mbgl/util/raster.hpp
+++ b/include/mbgl/util/raster.hpp
@@ -4,6 +4,7 @@
 #include <mbgl/util/transition.hpp>
 #include <mbgl/util/texturepool.hpp>
 #include <mbgl/util/image.hpp>
+#include <mbgl/renderer/prerendered_texture.hpp>
 
 #include <string>
 #include <mutex>
@@ -25,6 +26,9 @@ public:
     // bind current texture
     void bind(bool linear = false);
 
+    // bind prerendered texture
+    void bind(const GLuint texture);
+    
     // loaded status
     bool isLoaded() const;
 
-- 
cgit v1.2.1