Skip to content

A
angle
Commit e83d1a93 by Jamie Madill
Options

Change Texture::convertToRenderTarget to ensureRenderTarget, which tries to…

Change Texture::convertToRenderTarget to ensureRenderTarget, which tries to convert a storage to a RT if it isn't already. TRAC #23961 Signed-off-by: Geoff Lang Signed-off-by: Shannon Woods
parent 632192dd
Showing with 56 additions and 69 deletions
src/libGLESv2/Texture.cpp
...@@ -572,11 +572,7 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei ...@@ -572,11 +572,7 @@ void Texture2D::copyImage(GLint level, GLenum format, GLint x, GLint y, GLsizei
} }
else else
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) ensureRenderTarget();
{
convertToRenderTarget();
}
mImageArray[level]->markClean(); mImageArray[level]->markClean();
if (width != 0 && height != 0 && level < levelCount()) if (width != 0 && height != 0 && level < levelCount())
...@@ -610,10 +606,7 @@ void Texture2D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yo ...@@ -610,10 +606,7 @@ void Texture2D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yo
} }
else else
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) ensureRenderTarget();
{
convertToRenderTarget();
}
if (level < levelCount()) if (level < levelCount())
{ {
...@@ -852,8 +845,13 @@ void Texture2D::updateTextureLevel(int level) ...@@ -852,8 +845,13 @@ void Texture2D::updateTextureLevel(int level)
} }
} }
void Texture2D::convertToRenderTarget() bool Texture2D::ensureRenderTarget()
{ {
if (mTexStorage && mTexStorage->isRenderTarget())
{
return true;
}
rx::TextureStorageInterface2D *newTexStorage = NULL; rx::TextureStorageInterface2D *newTexStorage = NULL;
GLsizei width = getBaseLevelWidth(); GLsizei width = getBaseLevelWidth();
...@@ -870,7 +868,7 @@ void Texture2D::convertToRenderTarget() ...@@ -870,7 +868,7 @@ void Texture2D::convertToRenderTarget()
if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage)) if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage))
{ {
delete newTexStorage; delete newTexStorage;
return gl::error(GL_OUT_OF_MEMORY); return gl::error(GL_OUT_OF_MEMORY, false);
} }
} }
} }
...@@ -879,6 +877,8 @@ void Texture2D::convertToRenderTarget() ...@@ -879,6 +877,8 @@ void Texture2D::convertToRenderTarget()
mTexStorage = newTexStorage; mTexStorage = newTexStorage;
mDirtyImages = true; mDirtyImages = true;
return (mTexStorage && mTexStorage->isRenderTarget());
} }
void Texture2D::generateMipmaps() void Texture2D::generateMipmaps()
...@@ -929,12 +929,7 @@ Renderbuffer *Texture2D::getRenderbuffer(GLint level) ...@@ -929,12 +929,7 @@ Renderbuffer *Texture2D::getRenderbuffer(GLint level)
unsigned int Texture2D::getRenderTargetSerial(GLint level) unsigned int Texture2D::getRenderTargetSerial(GLint level)
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) return (ensureRenderTarget() ? mTexStorage->getRenderTargetSerial(level) : 0);
{
convertToRenderTarget();
}
return mTexStorage ? mTexStorage->getRenderTargetSerial(level) : 0;
} }
rx::RenderTarget *Texture2D::getRenderTarget(GLint level) rx::RenderTarget *Texture2D::getRenderTarget(GLint level)
...@@ -986,7 +981,7 @@ rx::TextureStorageInterface *Texture2D::getStorage(bool renderTarget) ...@@ -986,7 +981,7 @@ rx::TextureStorageInterface *Texture2D::getStorage(bool renderTarget)
{ {
if (renderTarget) if (renderTarget)
{ {
convertToRenderTarget(); ensureRenderTarget();
} }
else else
{ {
...@@ -1324,8 +1319,13 @@ void TextureCubeMap::updateTextureFaceLevel(int face, int level) ...@@ -1324,8 +1319,13 @@ void TextureCubeMap::updateTextureFaceLevel(int face, int level)
} }
} }
void TextureCubeMap::convertToRenderTarget() bool TextureCubeMap::ensureRenderTarget()
{ {
if (mTexStorage && mTexStorage->isRenderTarget())
{
return true;
}
rx::TextureStorageInterfaceCube *newTexStorage = NULL; rx::TextureStorageInterfaceCube *newTexStorage = NULL;
if (getBaseLevelWidth() != 0) if (getBaseLevelWidth() != 0)
...@@ -1341,7 +1341,7 @@ void TextureCubeMap::convertToRenderTarget() ...@@ -1341,7 +1341,7 @@ void TextureCubeMap::convertToRenderTarget()
if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage)) if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage))
{ {
delete newTexStorage; delete newTexStorage;
return gl::error(GL_OUT_OF_MEMORY); return gl::error(GL_OUT_OF_MEMORY, false);
} }
} }
} }
...@@ -1350,6 +1350,7 @@ void TextureCubeMap::convertToRenderTarget() ...@@ -1350,6 +1350,7 @@ void TextureCubeMap::convertToRenderTarget()
mTexStorage = newTexStorage; mTexStorage = newTexStorage;
mDirtyImages = true; mDirtyImages = true;
return (mTexStorage && mTexStorage->isRenderTarget());
} }
void TextureCubeMap::setImage(int faceIndex, GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels) void TextureCubeMap::setImage(int faceIndex, GLint level, GLsizei width, GLsizei height, GLenum internalFormat, GLenum format, GLenum type, const PixelUnpackState &unpack, const void *pixels)
...@@ -1423,11 +1424,7 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint ...@@ -1423,11 +1424,7 @@ void TextureCubeMap::copyImage(GLenum target, GLint level, GLenum format, GLint
} }
else else
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) ensureRenderTarget();
{
convertToRenderTarget();
}
mImageArray[faceindex][level]->markClean(); mImageArray[faceindex][level]->markClean();
ASSERT(width == height); ASSERT(width == height);
...@@ -1468,10 +1465,7 @@ void TextureCubeMap::copySubImage(GLenum target, GLint level, GLint xoffset, GLi ...@@ -1468,10 +1465,7 @@ void TextureCubeMap::copySubImage(GLenum target, GLint level, GLint xoffset, GLi
} }
else else
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) ensureRenderTarget();
{
convertToRenderTarget();
}
if (level < levelCount()) if (level < levelCount())
{ {
...@@ -1594,12 +1588,7 @@ Renderbuffer *TextureCubeMap::getRenderbuffer(GLenum target, GLint level) ...@@ -1594,12 +1588,7 @@ Renderbuffer *TextureCubeMap::getRenderbuffer(GLenum target, GLint level)
unsigned int TextureCubeMap::getRenderTargetSerial(GLenum faceTarget, GLint level) unsigned int TextureCubeMap::getRenderTargetSerial(GLenum faceTarget, GLint level)
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) return (ensureRenderTarget() ? mTexStorage->getRenderTargetSerial(faceTarget, level) : 0);
{
convertToRenderTarget();
}
return mTexStorage ? mTexStorage->getRenderTargetSerial(faceTarget, level) : 0;
} }
rx::RenderTarget *TextureCubeMap::getRenderTarget(GLenum target, GLint level) rx::RenderTarget *TextureCubeMap::getRenderTarget(GLenum target, GLint level)
...@@ -1655,7 +1644,7 @@ rx::TextureStorageInterface *TextureCubeMap::getStorage(bool renderTarget) ...@@ -1655,7 +1644,7 @@ rx::TextureStorageInterface *TextureCubeMap::getStorage(bool renderTarget)
{ {
if (renderTarget) if (renderTarget)
{ {
convertToRenderTarget(); ensureRenderTarget();
} }
else else
{ {
...@@ -1878,10 +1867,7 @@ void Texture3D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yo ...@@ -1878,10 +1867,7 @@ void Texture3D::copySubImage(GLenum target, GLint level, GLint xoffset, GLint yo
} }
else else
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) ensureRenderTarget();
{
convertToRenderTarget();
}
if (level < levelCount()) if (level < levelCount())
{ {
...@@ -2011,12 +1997,7 @@ Renderbuffer *Texture3D::getRenderbuffer(GLint level, GLint layer) ...@@ -2011,12 +1997,7 @@ Renderbuffer *Texture3D::getRenderbuffer(GLint level, GLint layer)
unsigned int Texture3D::getRenderTargetSerial(GLint level, GLint layer) unsigned int Texture3D::getRenderTargetSerial(GLint level, GLint layer)
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) return (ensureRenderTarget() ? mTexStorage->getRenderTargetSerial(level, layer) : 0);
{
convertToRenderTarget();
}
return mTexStorage ? mTexStorage->getRenderTargetSerial(level, layer) : 0;
} }
int Texture3D::levelCount() int Texture3D::levelCount()
...@@ -2075,8 +2056,13 @@ void Texture3D::updateTextureLevel(int level) ...@@ -2075,8 +2056,13 @@ void Texture3D::updateTextureLevel(int level)
} }
} }
void Texture3D::convertToRenderTarget() bool Texture3D::ensureRenderTarget()
{ {
if (mTexStorage && mTexStorage->isRenderTarget())
{
return true;
}
rx::TextureStorageInterface3D *newTexStorage = NULL; rx::TextureStorageInterface3D *newTexStorage = NULL;
if (getBaseLevelWidth() != 0 && getBaseLevelHeight() != 0 && getBaseLevelDepth() != 0) if (getBaseLevelWidth() != 0 && getBaseLevelHeight() != 0 && getBaseLevelDepth() != 0)
...@@ -2093,7 +2079,7 @@ void Texture3D::convertToRenderTarget() ...@@ -2093,7 +2079,7 @@ void Texture3D::convertToRenderTarget()
if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage)) if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage))
{ {
delete newTexStorage; delete newTexStorage;
return gl::error(GL_OUT_OF_MEMORY); return gl::error(GL_OUT_OF_MEMORY, false);
} }
} }
} }
...@@ -2102,6 +2088,7 @@ void Texture3D::convertToRenderTarget() ...@@ -2102,6 +2088,7 @@ void Texture3D::convertToRenderTarget()
mTexStorage = newTexStorage; mTexStorage = newTexStorage;
mDirtyImages = true; mDirtyImages = true;
return (mTexStorage && mTexStorage->isRenderTarget());
} }
rx::RenderTarget *Texture3D::getRenderTarget(GLint level) rx::RenderTarget *Texture3D::getRenderTarget(GLint level)
...@@ -2167,7 +2154,7 @@ rx::TextureStorageInterface *Texture3D::getStorage(bool renderTarget) ...@@ -2167,7 +2154,7 @@ rx::TextureStorageInterface *Texture3D::getStorage(bool renderTarget)
{ {
if (renderTarget) if (renderTarget)
{ {
convertToRenderTarget(); ensureRenderTarget();
} }
else else
{ {
...@@ -2458,10 +2445,7 @@ void Texture2DArray::copySubImage(GLenum target, GLint level, GLint xoffset, GLi ...@@ -2458,10 +2445,7 @@ void Texture2DArray::copySubImage(GLenum target, GLint level, GLint xoffset, GLi
} }
else else
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) ensureRenderTarget();
{
convertToRenderTarget();
}
if (level < levelCount()) if (level < levelCount())
{ {
...@@ -2585,14 +2569,9 @@ Renderbuffer *Texture2DArray::getRenderbuffer(GLint level, GLint layer) ...@@ -2585,14 +2569,9 @@ Renderbuffer *Texture2DArray::getRenderbuffer(GLint level, GLint layer)
return renderBuffer; return renderBuffer;
} }
unsigned int Texture2DArray::getRenderTargetSerial( GLint level, GLint layer ) unsigned int Texture2DArray::getRenderTargetSerial(GLint level, GLint layer)
{ {
if (!mTexStorage || !mTexStorage->isRenderTarget()) return (ensureRenderTarget() ? mTexStorage->getRenderTargetSerial(level, layer) : 0);
{
convertToRenderTarget();
}
return mTexStorage ? mTexStorage->getRenderTargetSerial(level, layer) : 0;
} }
int Texture2DArray::levelCount() int Texture2DArray::levelCount()
...@@ -2660,8 +2639,13 @@ void Texture2DArray::updateTextureLevel(int level) ...@@ -2660,8 +2639,13 @@ void Texture2DArray::updateTextureLevel(int level)
} }
} }
void Texture2DArray::convertToRenderTarget() bool Texture2DArray::ensureRenderTarget()
{ {
if (mTexStorage && mTexStorage->isRenderTarget())
{
return true;
}
rx::TextureStorageInterface2DArray *newTexStorage = NULL; rx::TextureStorageInterface2DArray *newTexStorage = NULL;
GLsizei width = getBaseLevelWidth(); GLsizei width = getBaseLevelWidth();
...@@ -2680,7 +2664,7 @@ void Texture2DArray::convertToRenderTarget() ...@@ -2680,7 +2664,7 @@ void Texture2DArray::convertToRenderTarget()
if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage)) if (!mRenderer->copyToRenderTarget(newTexStorage, mTexStorage))
{ {
delete newTexStorage; delete newTexStorage;
return gl::error(GL_OUT_OF_MEMORY); return gl::error(GL_OUT_OF_MEMORY, false);
} }
} }
} }
...@@ -2689,6 +2673,7 @@ void Texture2DArray::convertToRenderTarget() ...@@ -2689,6 +2673,7 @@ void Texture2DArray::convertToRenderTarget()
mTexStorage = newTexStorage; mTexStorage = newTexStorage;
mDirtyImages = true; mDirtyImages = true;
return (mTexStorage && mTexStorage->isRenderTarget());
} }
rx::RenderTarget *Texture2DArray::getRenderTarget(GLint level, GLint layer) rx::RenderTarget *Texture2DArray::getRenderTarget(GLint level, GLint layer)
...@@ -2735,7 +2720,7 @@ rx::TextureStorageInterface *Texture2DArray::getStorage(bool renderTarget) ...@@ -2735,7 +2720,7 @@ rx::TextureStorageInterface *Texture2DArray::getStorage(bool renderTarget)
{ {
if (renderTarget) if (renderTarget)
{ {
convertToRenderTarget(); ensureRenderTarget();
} }
else else
{ {
......
src/libGLESv2/Texture.h
...@@ -128,7 +128,7 @@ class Texture : public RefCountObject ...@@ -128,7 +128,7 @@ class Texture : public RefCountObject
virtual void createTexture() = 0; virtual void createTexture() = 0;
virtual void updateTexture() = 0; virtual void updateTexture() = 0;
virtual void convertToRenderTarget() = 0; virtual bool ensureRenderTarget() = 0;
rx::Renderer *mRenderer; rx::Renderer *mRenderer;
...@@ -197,7 +197,7 @@ class Texture2D : public Texture ...@@ -197,7 +197,7 @@ class Texture2D : public Texture
virtual void createTexture(); virtual void createTexture();
virtual void updateTexture(); virtual void updateTexture();
virtual void convertToRenderTarget(); virtual bool ensureRenderTarget();
virtual rx::TextureStorageInterface *getStorage(bool renderTarget); virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
virtual const rx::Image *getBaseLevelImage() const; virtual const rx::Image *getBaseLevelImage() const;
...@@ -264,7 +264,7 @@ class TextureCubeMap : public Texture ...@@ -264,7 +264,7 @@ class TextureCubeMap : public Texture
virtual void createTexture(); virtual void createTexture();
virtual void updateTexture(); virtual void updateTexture();
virtual void convertToRenderTarget(); virtual bool ensureRenderTarget();
virtual rx::TextureStorageInterface *getStorage(bool renderTarget); virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
virtual const rx::Image *getBaseLevelImage() const; virtual const rx::Image *getBaseLevelImage() const;
...@@ -323,7 +323,8 @@ class Texture3D : public Texture ...@@ -323,7 +323,8 @@ class Texture3D : public Texture
virtual void createTexture(); virtual void createTexture();
virtual void updateTexture(); virtual void updateTexture();
virtual void convertToRenderTarget(); virtual bool ensureRenderTarget();
virtual rx::TextureStorageInterface *getStorage(bool renderTarget); virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
virtual const rx::Image *getBaseLevelImage() const; virtual const rx::Image *getBaseLevelImage() const;
...@@ -379,7 +380,8 @@ class Texture2DArray : public Texture ...@@ -379,7 +380,8 @@ class Texture2DArray : public Texture
virtual void createTexture(); virtual void createTexture();
virtual void updateTexture(); virtual void updateTexture();
virtual void convertToRenderTarget(); virtual bool ensureRenderTarget();
virtual rx::TextureStorageInterface *getStorage(bool renderTarget); virtual rx::TextureStorageInterface *getStorage(bool renderTarget);
virtual const rx::Image *getBaseLevelImage() const; virtual const rx::Image *getBaseLevelImage() const;
......
src/libGLESv2/renderer/d3d9/Renderer9.cpp
...@@ -249,7 +249,7 @@ EGLint Renderer9::initialize() ...@@ -249,7 +249,7 @@ EGLint Renderer9::initialize()
} }
// When DirectX9 is running with an older DirectX8 driver, a StretchRect from a regular texture to a render target texture is not supported. // When DirectX9 is running with an older DirectX8 driver, a StretchRect from a regular texture to a render target texture is not supported.
// This is required by Texture2D::convertToRenderTarget. // This is required by Texture2D::ensureRenderTarget.
if ((mDeviceCaps.DevCaps2 & D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES) == 0) if ((mDeviceCaps.DevCaps2 & D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES) == 0)
{ {
ERR("Renderer does not support stretctrect from textures!\n"); ERR("Renderer does not support stretctrect from textures!\n");
......
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