Moved common members in TextureStorage11_2D and TextureStorage11_Cube into TextureStorage11.
TRAC #22422
Signed-off-by: Jamie Madill
Signed-off-by: Nicolas Capens
Author: Geoff Lang
git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1914 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/libGLESv2/renderer/TextureStorage11.cpp b/src/libGLESv2/renderer/TextureStorage11.cpp
index c328904..a0921df 100644
--- a/src/libGLESv2/renderer/TextureStorage11.cpp
+++ b/src/libGLESv2/renderer/TextureStorage11.cpp
@@ -22,7 +22,14 @@
TextureStorage11::TextureStorage11(Renderer *renderer, UINT bindFlags)
: mBindFlags(bindFlags),
mLodOffset(0),
- mMipLevels(0)
+ mMipLevels(0),
+ mTexture(NULL),
+ mTextureFormat(DXGI_FORMAT_UNKNOWN),
+ mShaderResourceFormat(DXGI_FORMAT_UNKNOWN),
+ mRenderTargetFormat(DXGI_FORMAT_UNKNOWN),
+ mDepthStencilFormat(DXGI_FORMAT_UNKNOWN),
+ mTextureWidth(0),
+ mTextureHeight(0)
{
mRenderer = Renderer11::makeRenderer11(renderer);
}
@@ -82,6 +89,11 @@
return mBindFlags;
}
+ID3D11Texture2D *TextureStorage11::getBaseTexture() const
+{
+ return mTexture;
+}
+
int TextureStorage11::getLodOffset() const
{
return mLodOffset;
@@ -210,11 +222,6 @@
TextureStorage11_2D::TextureStorage11_2D(Renderer *renderer, int levels, GLenum internalformat, GLenum usage, bool forceRenderable, GLsizei width, GLsizei height)
: TextureStorage11(renderer, GetTextureBindFlags(gl_d3d11::ConvertTextureFormat(internalformat), usage, forceRenderable))
{
- mTexture = NULL;
- mSRV = NULL;
- mTextureWidth = 0;
- mTextureHeight = 0;
-
for (unsigned int i = 0; i < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; i++)
{
mRenderTarget[i] = NULL;
@@ -398,11 +405,6 @@
}
}
-ID3D11Texture2D *TextureStorage11_2D::getBaseTexture() const
-{
- return mTexture;
-}
-
ID3D11ShaderResourceView *TextureStorage11_2D::getSRV()
{
if (!mSRV)
@@ -438,11 +440,6 @@
TextureStorage11_Cube::TextureStorage11_Cube(Renderer *renderer, int levels, GLenum internalformat, GLenum usage, bool forceRenderable, int size)
: TextureStorage11(renderer, GetTextureBindFlags(gl_d3d11::ConvertTextureFormat(internalformat), usage, forceRenderable))
{
- mTexture = NULL;
- mSRV = NULL;
- mTextureWidth = 0;
- mTextureHeight = 0;
-
for (unsigned int i = 0; i < 6; i++)
{
for (unsigned int j = 0; j < gl::IMPLEMENTATION_MAX_TEXTURE_LEVELS; j++)
@@ -633,11 +630,6 @@
}
}
-ID3D11Texture2D *TextureStorage11_Cube::getBaseTexture() const
-{
- return mTexture;
-}
-
ID3D11ShaderResourceView *TextureStorage11_Cube::getSRV()
{
if (!mSRV)