glGenerateMipmap now does not force textures to become render targets.

For textures that are not already render targets, use the CPU to filter them and mark them as dirty. I tested it by modifying the "mip_map_2d" demo to call glGenerateMipmap instead of generating the mipmaps itself. I also used the debugger to force it to take the render target path and verified that it still worked. We've been having problems with the display being reset when video memory pressure is heavy with one of our demos. This patch made a noticable improvement on Vista but I don't think it will necessarily help on XP. Review URL: http://codereview.appspot.com/3262041 git-svn-id: https://angleproject.googlecode.com/svn/trunk@490 736b8ea6-26fd-11df-bfd4-992fa37f6226

glGenerateMipmap now does not force textures to become render targets.
9d1c9b4b · apatrick@chromium.org · bafcbaa3 · 9d1c9b4b · 9d1c9b4b
Commit 9d1c9b4b authored Nov 23, 2010 by apatrick@chromium.org
Hide whitespace changes
Inline Side-by-side

Showing with 85 additions and 30 deletions

Texture.cpp src/libGLESv2/Texture.cpp +83 -30

Texture.h src/libGLESv2/Texture.h +2 -0

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -10,6 +10,8 @@

 #include "libGLESv2/Texture.h"

+#include <d3dx9tex.h>
+
 #include <algorithm>

 #include "common/debug.h"
@@ -1137,6 +1139,11 @@ int Texture::levelCount() const
    return mBaseTexture ? mBaseTexture->GetLevelCount() : 0;
 }

+bool Texture::isRenderable() const
+{
+    return mIsRenderable;
+}
+
 Texture2D::Texture2D(GLuint id) : Texture(id)
 {
    mTexture = NULL;
@@ -1623,28 +1630,50 @@ void Texture2D::generateMipmaps()
        mImageArray[i].height = std::max(mImageArray[0].height >> i, 1);
    }

-    needRenderTarget();
-
-    if (mTexture == NULL)
+    if (isRenderable())
    {
-        return;
-    }
+        if (mTexture == NULL)
+        {
+            ERR(" failed because mTexture was null.");
+            return;
+        }

-    for (unsigned int i = 1; i <= q; i++)
-    {
-        IDirect3DSurface9 *upper = NULL;
-        IDirect3DSurface9 *lower = NULL;
+        for (unsigned int i = 1; i <= q; i++)
+        {
+            IDirect3DSurface9 *upper = NULL;
+            IDirect3DSurface9 *lower = NULL;

-        mTexture->GetSurfaceLevel(i-1, &upper);
-        mTexture->GetSurfaceLevel(i, &lower);
+            mTexture->GetSurfaceLevel(i-1, &upper);
+            mTexture->GetSurfaceLevel(i, &lower);
+
+            if (upper != NULL && lower != NULL)
+            {
+                getBlitter()->boxFilter(upper, lower);
+            }

-        if (upper != NULL && lower != NULL)
+            if (upper != NULL) upper->Release();
+            if (lower != NULL) lower->Release();
+        }
+    }
+    else
+    {
+        for (unsigned int i = 1; i <= q; i++)
        {
-            getBlitter()->boxFilter(upper, lower);
+            createSurface(mImageArray[i].width, mImageArray[i].height, mImageArray[i].format, mType, &mImageArray[i]);
+            if (mImageArray[i].surface == NULL)
+            {
+                return error(GL_OUT_OF_MEMORY);
+            }
+
+            if (FAILED(D3DXLoadSurfaceFromSurface(mImageArray[i].surface, NULL, NULL, mImageArray[i - 1].surface, NULL, NULL, D3DX_FILTER_BOX, 0)))
+            {
+                ERR(" failed to load filter %d to %d.", i - 1, i);
+            }
+
+            mImageArray[i].dirty = true;
        }

-        if (upper != NULL) upper->Release();
-        if (lower != NULL) lower->Release();
+        mDirtyMetaData = true;
    }
 }

@@ -2271,28 +2300,52 @@ void TextureCubeMap::generateMipmaps()
        }
    }

-    needRenderTarget();
-
-    if (mTexture == NULL)
-    {
-        return;
-    }
-
-    for (unsigned int f = 0; f < 6; f++)
+    if (isRenderable())
    {
-        for (unsigned int i = 1; i <= q; i++)
+        if (mTexture == NULL)
        {
-            IDirect3DSurface9 *upper = getCubeMapSurface(f, i-1);
-            IDirect3DSurface9 *lower = getCubeMapSurface(f, i);
+            return;
+        }

-            if (upper != NULL && lower != NULL)
+        for (unsigned int f = 0; f < 6; f++)
+        {
+            for (unsigned int i = 1; i <= q; i++)
            {
-                getBlitter()->boxFilter(upper, lower);
+                IDirect3DSurface9 *upper = getCubeMapSurface(f, i-1);
+                IDirect3DSurface9 *lower = getCubeMapSurface(f, i);
+
+                if (upper != NULL && lower != NULL)
+                {
+                    getBlitter()->boxFilter(upper, lower);
+                }
+
+                if (upper != NULL) upper->Release();
+                if (lower != NULL) lower->Release();
            }
+        }
+    }
+    else
+    {
+        for (unsigned int f = 0; f < 6; f++)
+        {
+            for (unsigned int i = 1; i <= q; i++)
+            {
+                createSurface(mImageArray[f][i].width, mImageArray[f][i].height, mImageArray[f][i].format, mType, &mImageArray[f][i]);
+                if (mImageArray[f][i].surface == NULL)
+                {
+                    return error(GL_OUT_OF_MEMORY);
+                }

-            if (upper != NULL) upper->Release();
-            if (lower != NULL) lower->Release();
+                if (FAILED(D3DXLoadSurfaceFromSurface(mImageArray[f][i].surface, NULL, NULL, mImageArray[f][i - 1].surface, NULL, NULL, D3DX_FILTER_BOX, 0)))
+                {
+                    ERR(" failed to load filter %d to %d.", i - 1, i);
+                }
+
+                mImageArray[f][i].dirty = true;
+            }
        }
+
+        mDirtyMetaData = true;
    }
 }


--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -144,6 +144,8 @@ class Texture : public RefCountObject

    int levelCount() const;

+    bool isRenderable() const;
+
    unsigned int mWidth;
    unsigned int mHeight;
    GLenum mMinFilter;