Skip to content

A
angle
Commit 4b472353 by shannon.woods@transgaming.com
Options

TextureStorage11 classes now store a render target to each mip level.

Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1736 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 8daaf165
Showing with 104 additions and 38 deletions
src/libGLESv2/renderer/TextureStorage11.cpp
...@@ -208,10 +208,28 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer *renderer, int levels, GLenum ...@@ -208,10 +208,28 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer *renderer, int levels, GLenum
TextureStorage11_2D::~TextureStorage11_2D() TextureStorage11_2D::~TextureStorage11_2D()
{ {
if (mTexture) if (mTexture)
{
mTexture->Release(); mTexture->Release();
mTexture = NULL;
}
if (mSRV) if (mSRV)
{
mSRV->Release(); mSRV->Release();
mSRV = NULL;
}
if (mRenderTarget)
{
for (unsigned int i = 0; i < mMipLevels; i++)
{
delete mRenderTarget[i];
mRenderTarget[i] = NULL;
}
delete[] mRenderTarget;
mRenderTarget = NULL;
}
} }
TextureStorage11_2D *TextureStorage11_2D::makeTextureStorage11_2D(TextureStorage *storage) TextureStorage11_2D *TextureStorage11_2D::makeTextureStorage11_2D(TextureStorage *storage)
...@@ -220,9 +238,16 @@ TextureStorage11_2D *TextureStorage11_2D::makeTextureStorage11_2D(TextureStorage ...@@ -220,9 +238,16 @@ TextureStorage11_2D *TextureStorage11_2D::makeTextureStorage11_2D(TextureStorage
return static_cast<TextureStorage11_2D*>(storage); return static_cast<TextureStorage11_2D*>(storage);
} }
RenderTarget *TextureStorage11_2D::getRenderTarget() const RenderTarget *TextureStorage11_2D::getRenderTarget(int level) const
{ {
return mRenderTarget; if (level < 0 || level >= static_cast<int>(mMipLevels))
{
return NULL;
}
else
{
return mRenderTarget[level];
}
} }
ID3D11Texture2D *TextureStorage11_2D::getBaseTexture() const ID3D11Texture2D *TextureStorage11_2D::getBaseTexture() const
...@@ -249,23 +274,27 @@ void TextureStorage11_2D::initializeRenderTarget(DXGI_FORMAT format, int width, ...@@ -249,23 +274,27 @@ void TextureStorage11_2D::initializeRenderTarget(DXGI_FORMAT format, int width,
{ {
if (getBindFlags() & D3D11_BIND_RENDER_TARGET) if (getBindFlags() & D3D11_BIND_RENDER_TARGET)
{ {
// Create render target view -- texture should already be created with mRenderTarget = new RenderTarget11*[mMipLevels];
// BIND_RENDER_TARGET flag. for (unsigned i = 0; i < mMipLevels; i++)
D3D11_RENDER_TARGET_VIEW_DESC rtvDesc; {
rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D; // Create render target view -- texture should already be created with
rtvDesc.Format = format; // BIND_RENDER_TARGET flag.
rtvDesc.Texture2D.MipSlice = 0; D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
rtvDesc.Format = format;
rtvDesc.Texture2D.MipSlice = i;
ID3D11RenderTargetView *renderTargetView; ID3D11RenderTargetView *renderTargetView;
ID3D11Device *device = mRenderer->getDevice(); ID3D11Device *device = mRenderer->getDevice();
HRESULT result = device->CreateRenderTargetView(mTexture, &rtvDesc, &renderTargetView); HRESULT result = device->CreateRenderTargetView(mTexture, &rtvDesc, &renderTargetView);
if (result == E_OUTOFMEMORY) if (result == E_OUTOFMEMORY)
return; return;
ASSERT(SUCCEEDED(result)); ASSERT(SUCCEEDED(result));
mRenderTarget = new RenderTarget11(mRenderer, renderTargetView, width, height); mRenderTarget[i] = new RenderTarget11(mRenderer, renderTargetView, std::max(width >> i, 1), std::max(height >> i, 1));
}
} }
else if (getBindFlags() & D3D11_BIND_DEPTH_STENCIL) else if (getBindFlags() & D3D11_BIND_DEPTH_STENCIL)
{ {
...@@ -306,8 +335,8 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer *renderer, int levels, GLe ...@@ -306,8 +335,8 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer *renderer, int levels, GLe
{ {
mTexture = NULL; mTexture = NULL;
mSRV = NULL; mSRV = NULL;
for (int i = 0; i < 6; ++i) for (unsigned int i = 0; i < 6; ++i)
{ {
mRenderTarget[i] = NULL; mRenderTarget[i] = NULL;
} }
...@@ -358,10 +387,31 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer *renderer, int levels, GLe ...@@ -358,10 +387,31 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer *renderer, int levels, GLe
TextureStorage11_Cube::~TextureStorage11_Cube() TextureStorage11_Cube::~TextureStorage11_Cube()
{ {
if (mTexture) if (mTexture)
{
mTexture->Release(); mTexture->Release();
mTexture = NULL;
}
if (mSRV) if (mSRV)
{
mSRV->Release(); mSRV->Release();
mSRV = NULL;
}
for (unsigned int i = 0; i < 6; i++)
{
if (mRenderTarget[i])
{
for (unsigned int j = 0; j < mMipLevels; j++)
{
delete mRenderTarget[i][j];
mRenderTarget[i][j] = NULL;
}
delete[] mRenderTarget[i];
mRenderTarget[i] = NULL;
}
}
} }
TextureStorage11_Cube *TextureStorage11_Cube::makeTextureStorage11_Cube(TextureStorage *storage) TextureStorage11_Cube *TextureStorage11_Cube::makeTextureStorage11_Cube(TextureStorage *storage)
...@@ -370,9 +420,16 @@ TextureStorage11_Cube *TextureStorage11_Cube::makeTextureStorage11_Cube(TextureS ...@@ -370,9 +420,16 @@ TextureStorage11_Cube *TextureStorage11_Cube::makeTextureStorage11_Cube(TextureS
return static_cast<TextureStorage11_Cube*>(storage); return static_cast<TextureStorage11_Cube*>(storage);
} }
RenderTarget *TextureStorage11_Cube::getRenderTarget(GLenum faceTarget) const RenderTarget *TextureStorage11_Cube::getRenderTarget(GLenum faceTarget, int level) const
{ {
return mRenderTarget[gl::TextureCubeMap::faceIndex(faceTarget)]; if (level < 0 || level >= static_cast<int>(mMipLevels))
{
return NULL;
}
else
{
return mRenderTarget[gl::TextureCubeMap::faceIndex(faceTarget)][level];
}
} }
ID3D11Texture2D *TextureStorage11_Cube::getBaseTexture() const ID3D11Texture2D *TextureStorage11_Cube::getBaseTexture() const
...@@ -400,25 +457,32 @@ void TextureStorage11_Cube::initializeRenderTarget(DXGI_FORMAT format, int size) ...@@ -400,25 +457,32 @@ void TextureStorage11_Cube::initializeRenderTarget(DXGI_FORMAT format, int size)
// Create render target view -- texture should already be created with // Create render target view -- texture should already be created with
// BIND_RENDER_TARGET flag. // BIND_RENDER_TARGET flag.
for (int i = 0; i < 6; ++i) for (unsigned int i = 0; i < 6; ++i)
{ {
ASSERT(mRenderTarget[i] == NULL); ASSERT(mRenderTarget[i] == NULL);
D3D11_RENDER_TARGET_VIEW_DESC rtvDesc; mRenderTarget[i] = new RenderTarget11*[mMipLevels];
rtvDesc.Format = format;
rtvDesc.Texture2DArray.MipSlice = 0;
rtvDesc.Texture2DArray.FirstArraySlice = i;
rtvDesc.Texture2DArray.ArraySize = 1;
ID3D11RenderTargetView *renderTargetView; for (unsigned int j = 0; j < mMipLevels; j++)
ID3D11Device *device = mRenderer->getDevice(); {
HRESULT result = device->CreateRenderTargetView(mTexture, &rtvDesc, &renderTargetView); D3D11_RENDER_TARGET_VIEW_DESC rtvDesc;
rtvDesc.Format = format;
rtvDesc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
rtvDesc.Texture2DArray.MipSlice = j;
rtvDesc.Texture2DArray.FirstArraySlice = i;
rtvDesc.Texture2DArray.ArraySize = 1;
if (result == E_OUTOFMEMORY) ID3D11RenderTargetView *renderTargetView;
return; ID3D11Device *device = mRenderer->getDevice();
HRESULT result = device->CreateRenderTargetView(mTexture, &rtvDesc, &renderTargetView);
ASSERT(SUCCEEDED(result)); if (result == E_OUTOFMEMORY)
return;
ASSERT(SUCCEEDED(result));
mRenderTarget[i] = new RenderTarget11(mRenderer, renderTargetView, size, size); int mipSize = size >> j;
mRenderTarget[i][j] = new RenderTarget11(mRenderer, renderTargetView, mipSize, mipSize);
}
} }
} }
else if (getBindFlags() & D3D11_BIND_DEPTH_STENCIL) else if (getBindFlags() & D3D11_BIND_DEPTH_STENCIL)
......
src/libGLESv2/renderer/TextureStorage11.h
...@@ -37,8 +37,10 @@ class TextureStorage11 : public TextureStorage ...@@ -37,8 +37,10 @@ class TextureStorage11 : public TextureStorage
virtual ID3D11Texture2D *getBaseTexture() const = 0; virtual ID3D11Texture2D *getBaseTexture() const = 0;
virtual ID3D11ShaderResourceView *getSRV() const = 0; virtual ID3D11ShaderResourceView *getSRV() const = 0;
virtual RenderTarget *getRenderTarget() const { return NULL; } virtual RenderTarget *getRenderTarget() const { return getRenderTarget(0); }
virtual RenderTarget *getRenderTarget(GLenum faceTarget) const { return NULL; } virtual RenderTarget *getRenderTarget(int level) const { return NULL; }
virtual RenderTarget *getRenderTarget(GLenum faceTarget) const { return getRenderTarget(faceTarget, 0); }
virtual RenderTarget *getRenderTarget(GLenum faceTarget, int level) const { return NULL; }
virtual void generateMipmap(int level) {}; virtual void generateMipmap(int level) {};
virtual void generateMipmap(int face, int level) {}; virtual void generateMipmap(int face, int level) {};
...@@ -70,7 +72,7 @@ class TextureStorage11_2D : public TextureStorage11 ...@@ -70,7 +72,7 @@ class TextureStorage11_2D : public TextureStorage11
static TextureStorage11_2D *makeTextureStorage11_2D(TextureStorage *storage); static TextureStorage11_2D *makeTextureStorage11_2D(TextureStorage *storage);
virtual RenderTarget *getRenderTarget() const; virtual RenderTarget *getRenderTarget(int level) const;
virtual ID3D11Texture2D *getBaseTexture() const; virtual ID3D11Texture2D *getBaseTexture() const;
virtual ID3D11ShaderResourceView *getSRV() const; virtual ID3D11ShaderResourceView *getSRV() const;
virtual void generateMipmap(int level); virtual void generateMipmap(int level);
...@@ -83,7 +85,7 @@ class TextureStorage11_2D : public TextureStorage11 ...@@ -83,7 +85,7 @@ class TextureStorage11_2D : public TextureStorage11
ID3D11Texture2D *mTexture; ID3D11Texture2D *mTexture;
ID3D11ShaderResourceView *mSRV; ID3D11ShaderResourceView *mSRV;
RenderTarget11 *mRenderTarget; RenderTarget11 **mRenderTarget;
}; };
class TextureStorage11_Cube : public TextureStorage11 class TextureStorage11_Cube : public TextureStorage11
...@@ -94,7 +96,7 @@ class TextureStorage11_Cube : public TextureStorage11 ...@@ -94,7 +96,7 @@ class TextureStorage11_Cube : public TextureStorage11
static TextureStorage11_Cube *makeTextureStorage11_Cube(TextureStorage *storage); static TextureStorage11_Cube *makeTextureStorage11_Cube(TextureStorage *storage);
virtual RenderTarget *getRenderTarget(GLenum faceTarget) const; virtual RenderTarget *getRenderTarget(GLenum faceTarget, int level) const;
virtual ID3D11Texture2D *getBaseTexture() const; virtual ID3D11Texture2D *getBaseTexture() const;
virtual ID3D11ShaderResourceView *getSRV() const; virtual ID3D11ShaderResourceView *getSRV() const;
virtual void generateMipmap(int face, int level); virtual void generateMipmap(int face, int level);
...@@ -107,7 +109,7 @@ class TextureStorage11_Cube : public TextureStorage11 ...@@ -107,7 +109,7 @@ class TextureStorage11_Cube : public TextureStorage11
ID3D11Texture2D *mTexture; ID3D11Texture2D *mTexture;
ID3D11ShaderResourceView *mSRV; ID3D11ShaderResourceView *mSRV;
RenderTarget11 *mRenderTarget[6]; RenderTarget11 **mRenderTarget[6];
}; };
} }
......
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