commit 8aa195d7081b889f3a7b1f426cbd8556377aae5e
author Romain Guy <romainguy@google.com> Tue Jun 04 18:00:09 2013 -0700
committer Romain Guy <romainguy@google.com> Tue Jun 04 18:58:36 2013 -0700
tree 6cd0ab4181c25d3113c4e39b49e8f8a0c7d12b8b
parent 84f3c5689cffbfc1e45a0101d5bb636323769f54

Introduce Caches::bindTexture() to reduce glBindTexture calls

Change-Id: Ic345422567c020c0a9035ff51dcf2ae2a1fc59f4

libs/hwui/AssetAtlas.cpp

diff --git a/libs/hwui/AssetAtlas.cpp b/libs/hwui/AssetAtlas.cpp
index 8511e7c..782c052 100644
--- a/libs/hwui/AssetAtlas.cpp
+++ b/libs/hwui/AssetAtlas.cpp
@@ -15,6 +15,7 @@
  */
 
 #include "AssetAtlas.h"
+#include "Caches.h"
 
 #include <GLES2/gl2ext.h>
 
@@ -33,12 +34,14 @@
     mImage = new Image(buffer);
 
     if (mImage->getTexture()) {
-        mTexture = new Texture();
+        Caches& caches = Caches::getInstance();
+
+        mTexture = new Texture(caches);
         mTexture->id = mImage->getTexture();
         mTexture->width = buffer->getWidth();
         mTexture->height = buffer->getHeight();
 
-        createEntries(map, count);
+        createEntries(caches, map, count);
     } else {
         ALOGW("Could not create atlas image");
 
@@ -82,7 +85,7 @@
  * instead of applying the changes to the virtual textures.
  */
 struct DelegateTexture: public Texture {
-    DelegateTexture(Texture* delegate): Texture(), mDelegate(delegate) { }
+    DelegateTexture(Caches& caches, Texture* delegate): Texture(caches), mDelegate(delegate) { }
 
     virtual void setWrapST(GLenum wrapS, GLenum wrapT, bool bindTexture = false,
             bool force = false, GLenum renderTarget = GL_TEXTURE_2D) {
@@ -100,7 +103,7 @@
 /**
  * TODO: This method does not take the rotation flag into account
  */
-void AssetAtlas::createEntries(int* map, int count) {
+void AssetAtlas::createEntries(Caches& caches, int* map, int count) {
     const float width = float(mTexture->width);
     const float height = float(mTexture->height);
 
@@ -117,7 +120,7 @@
                 x / width, (x + bitmap->width()) / width,
                 y / height, (y + bitmap->height()) / height);
 
-        Texture* texture = new DelegateTexture(mTexture);
+        Texture* texture = new DelegateTexture(caches, mTexture);
         Entry* entry = new Entry(bitmap, x, y, rotated, texture, mapper, *this);
 
         texture->id = mTexture->id;