Let TextureStorage track the texture pool explicitly

Trac #19259 Issue=268 Signed-off-by: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@920 736b8ea6-26fd-11df-bfd4-992fa37f6226

Let TextureStorage track the texture pool explicitly
101f8697 · daniel@transgaming.com · f5cffc91 · 101f8697 · 101f8697
Commit 101f8697 authored Dec 16, 2011 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Texture.cpp src/libGLESv2/Texture.cpp +2 -2

Texture.h src/libGLESv2/Texture.h +1 -1

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1264,7 +1264,7 @@ void Image::copy(GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, 

 TextureStorage::TextureStorage(bool renderable)
    : mRenderable(renderable),
-      mManaged(getDisplay()->getTexturePool(renderable) == D3DPOOL_MANAGED),
+      mD3DPool(getDisplay()->getTexturePool(renderable)),
      mTextureSerial(issueTextureSerial())
 {
 }
@@ -1280,7 +1280,7 @@ bool TextureStorage::isRenderable() const

 bool TextureStorage::isManaged() const
 {
-    return mManaged;
+    return (mD3DPool == D3DPOOL_MANAGED);
 }

 unsigned int TextureStorage::getTextureSerial() const

--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -157,7 +157,7 @@ class TextureStorage
    DISALLOW_COPY_AND_ASSIGN(TextureStorage);

    const bool mRenderable;
-    const bool mManaged;
+    const D3DPOOL mD3DPool;

    const unsigned int mTextureSerial;
    static unsigned int issueTextureSerial();