Skip to content

A
angle
Commit 92399aa2 by daniel@transgaming.com
Options

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
parent 101f8697
Showing with 10 additions and 6 deletions
src/libGLESv2/Texture.cpp
...@@ -1283,6 +1283,11 @@ bool TextureStorage::isManaged() const ...@@ -1283,6 +1283,11 @@ bool TextureStorage::isManaged() const
return (mD3DPool == D3DPOOL_MANAGED); return (mD3DPool == D3DPOOL_MANAGED);
} }
D3DPOOL TextureStorage::getPool() const
{
return mD3DPool;
}
unsigned int TextureStorage::getTextureSerial() const unsigned int TextureStorage::getTextureSerial() const
{ {
return mTextureSerial; return mTextureSerial;
...@@ -1663,11 +1668,10 @@ TextureStorage2D::TextureStorage2D(IDirect3DTexture9 *surfaceTexture) : TextureS ...@@ -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()) TextureStorage2D::TextureStorage2D(int levels, D3DFORMAT format, int width, int height, bool renderable) : TextureStorage(renderable), mRenderTargetSerial(RenderbufferStorage::issueSerial())
{ {
egl::Display *display = getDisplay(); IDirect3DDevice9 *device = getDevice();
IDirect3DDevice9 *device = display->getDevice();
mTexture = NULL; 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)) if (FAILED(result))
{ {
...@@ -2316,11 +2320,10 @@ TextureStorage *Texture2D::getStorage() const ...@@ -2316,11 +2320,10 @@ TextureStorage *Texture2D::getStorage() const
TextureStorageCubeMap::TextureStorageCubeMap(int levels, D3DFORMAT format, int size, bool renderable) : TextureStorage(renderable), mFirstRenderTargetSerial(RenderbufferStorage::issueCubeSerials()) TextureStorageCubeMap::TextureStorageCubeMap(int levels, D3DFORMAT format, int size, bool renderable) : TextureStorage(renderable), mFirstRenderTargetSerial(RenderbufferStorage::issueCubeSerials())
{ {
egl::Display *display = getDisplay(); IDirect3DDevice9 *device = getDevice();
IDirect3DDevice9 *device = display->getDevice();
mTexture = NULL; 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)) if (FAILED(result))
{ {
......
src/libGLESv2/Texture.h
...@@ -150,6 +150,7 @@ class TextureStorage ...@@ -150,6 +150,7 @@ class TextureStorage
bool isRenderable() const; bool isRenderable() const;
bool isManaged() const; bool isManaged() const;
D3DPOOL getPool() const;
unsigned int getTextureSerial() const; unsigned int getTextureSerial() const;
virtual unsigned int getRenderTargetSerial(GLenum target) const = 0; virtual unsigned int getRenderTargetSerial(GLenum target) const = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment