Optimize Texture*::updateStorage by iterating over fewer levels.

Only update the storage on levels that exist. Especially helps for cube maps which have 90 images that would be iterated over in all cases. Added an additional early-out check if the image is dirty for cube maps to match the other texture types. BUG=260069 Change-Id: I3d298f4f9ebdc23136a31138a3ef8364667fa78c Reviewed-on: https://chromium-review.googlesource.com/199344Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Nicolas Capens <nicolascapens@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Optimize Texture*::updateStorage by iterating over fewer levels.
946b948d · Geoff Lang · ff0d2ba6 · 946b948d
Commit 946b948d authored May 12, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

Texture.cpp src/libGLESv2/Texture.cpp +14 -6

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -947,7 +947,9 @@ rx::TextureStorageInterface2D *Texture2D::createCompleteStorage(bool renderTarge

 void Texture2D::updateStorage()
 {
-    for (int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
+    ASSERT(mTexStorage != NULL);
+    GLint storageLevels = mTexStorage->getLevelCount();
+    for (int level = 0; level < storageLevels; level++)
    {
        if (mImageArray[level]->isDirty() && isLevelComplete(level))
        {
@@ -1418,11 +1420,13 @@ void TextureCubeMap::setCompleteTexStorage(rx::TextureStorageInterfaceCube *newC

 void TextureCubeMap::updateStorage()
 {
+    ASSERT(mTexStorage != NULL);
+    GLint storageLevels = mTexStorage->getLevelCount();
    for (int face = 0; face < 6; face++)
    {
-        for (int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
+        for (int level = 0; level < storageLevels; level++)
        {
-            if (isFaceLevelComplete(face, level))
+            if (mImageArray[face][level]->isDirty() && isFaceLevelComplete(face, level))
            {
                updateStorageFaceLevel(face, level);
            }
@@ -2130,9 +2134,11 @@ void Texture3D::setCompleteTexStorage(rx::TextureStorageInterface3D *newComplete

 void Texture3D::updateStorage()
 {
-    for (int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
+    ASSERT(mTexStorage != NULL);
+    GLint storageLevels = mTexStorage->getLevelCount();
+    for (int level = 0; level < storageLevels; level++)
    {
-        if (isLevelComplete(level))
+        if (mImageArray[level]->isDirty() && isLevelComplete(level))
        {
            updateStorageLevel(level);
        }
@@ -2684,7 +2690,9 @@ void Texture2DArray::setCompleteTexStorage(rx::TextureStorageInterface2DArray *n

 void Texture2DArray::updateStorage()
 {
-    for (int level = 0; level < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; level++)
+    ASSERT(mTexStorage != NULL);
+    GLint storageLevels = mTexStorage->getLevelCount();
+    for (int level = 0; level < storageLevels; level++)
    {
        if (isLevelComplete(level))
        {