Add TextureStorage::getPool method

Trac #19259 Issue=268 Use it to avoid duplicate calls to getTexturePool Signed-off-by: Nicolas Capens git-svn-id: https://angleproject.googlecode.com/svn/trunk@921 736b8ea6-26fd-11df-bfd4-992fa37f6226

Add TextureStorage::getPool method
92399aa2 · daniel@transgaming.com · 101f8697 · 92399aa2 · 92399aa2
Commit 92399aa2 authored Dec 16, 2011 by daniel@transgaming.com
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

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

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

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -1283,6 +1283,11 @@ bool TextureStorage::isManaged() const
    return (mD3DPool == D3DPOOL_MANAGED);
 }

+D3DPOOL TextureStorage::getPool() const
+{
+    return mD3DPool;
+}
+
 unsigned int TextureStorage::getTextureSerial() const
 {
    return mTextureSerial;
@@ -1663,11 +1668,10 @@ TextureStorage2D::TextureStorage2D(IDirect3DTexture9 *surfaceTexture) : TextureS

 TextureStorage2D::TextureStorage2D(int levels, D3DFORMAT format, int width, int height, bool renderable) : TextureStorage(renderable), mRenderTargetSerial(RenderbufferStorage::issueSerial())
 {
-    egl::Display *display = getDisplay();
-    IDirect3DDevice9 *device = display->getDevice();
+    IDirect3DDevice9 *device = getDevice();

    mTexture = NULL;
-    HRESULT result = device->CreateTexture(width, height, levels, renderable ? D3DUSAGE_RENDERTARGET : 0, format, display->getTexturePool(renderable), &mTexture, NULL);
+    HRESULT result = device->CreateTexture(width, height, levels, renderable ? D3DUSAGE_RENDERTARGET : 0, format, getPool(), &mTexture, NULL);

    if (FAILED(result))
    {
@@ -2316,11 +2320,10 @@ TextureStorage *Texture2D::getStorage() const

 TextureStorageCubeMap::TextureStorageCubeMap(int levels, D3DFORMAT format, int size, bool renderable) : TextureStorage(renderable), mFirstRenderTargetSerial(RenderbufferStorage::issueCubeSerials())
 {
-    egl::Display *display = getDisplay();
-    IDirect3DDevice9 *device = display->getDevice();
+    IDirect3DDevice9 *device = getDevice();

    mTexture = NULL;
-    HRESULT result = device->CreateCubeTexture(size, levels, renderable ? D3DUSAGE_RENDERTARGET : 0, format, display->getTexturePool(renderable), &mTexture, NULL);
+    HRESULT result = device->CreateCubeTexture(size, levels, renderable ? D3DUSAGE_RENDERTARGET : 0, format, getPool(), &mTexture, NULL);

    if (FAILED(result))
    {

--- a/src/libGLESv2/Texture.h
+++ b/src/libGLESv2/Texture.h
@@ -150,6 +150,7 @@ class TextureStorage

    bool isRenderable() const;
    bool isManaged() const;
+    D3DPOOL getPool() const;
    unsigned int getTextureSerial() const;
    virtual unsigned int getRenderTargetSerial(GLenum target) const = 0;