Skip to content

A
angle
Commit d787e50b by Jamie Madill Committed by Commit Bot
Options

Try more to use ANGLE_TRY.

Also refactor the Renderer11::copyImage functions to share code. BUG=angleproject:1384 Change-Id: I95f4266c0c9b67a13cba17797989fcc0b0d50c1d Reviewed-on: https://chromium-review.googlesource.com/347248Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 093a4c3c
Showing with 25 additions and 79 deletions
src/libANGLE/renderer/d3d/TextureD3D.cpp
......@@ -755,19 +755,12 @@ gl::Error TextureD3D_2D::setImage(GLenum target,
{
// Will try to create RT storage if it does not exist
RenderTargetD3D *destRenderTarget = NULL;
gl::Error error = getRenderTarget(index, &destRenderTarget);
if (error.isError())
{
return error;
}
ANGLE_TRY(getRenderTarget(index, &destRenderTarget));
gl::Box destArea(0, 0, 0, getWidth(level), getHeight(level), 1);
error = fastUnpackPixels(unpack, pixels, destArea, sizedInternalFormat, type, destRenderTarget);
if (error.isError())
{
return error;
}
ANGLE_TRY(fastUnpackPixels(unpack, pixels, destArea, sizedInternalFormat, type,
destRenderTarget));
// Ensure we don't overwrite our newly initialized data
mImageArray[level]->markClean();
......@@ -777,11 +770,7 @@ gl::Error TextureD3D_2D::setImage(GLenum target,
if (!fastUnpacked)
{
gl::Error error = setImageImpl(index, type, unpack, pixels, 0);
if (error.isError())
{
return error;
}
ANGLE_TRY(setImageImpl(index, type, unpack, pixels, 0));
}
return gl::Error(GL_NO_ERROR);
......@@ -802,12 +791,7 @@ gl::Error TextureD3D_2D::setSubImage(GLenum target,
if (isFastUnpackable(unpack, getInternalFormat(level)) && isLevelComplete(level))
{
RenderTargetD3D *renderTarget = NULL;
gl::Error error = getRenderTarget(index, &renderTarget);
if (error.isError())
{
return error;
}
ANGLE_TRY(getRenderTarget(index, &renderTarget));
ASSERT(!mImageArray[level]->isDirty());
return fastUnpackPixels(unpack, pixels, area, getInternalFormat(level), type, renderTarget);
......@@ -841,11 +825,7 @@ gl::Error TextureD3D_2D::setCompressedSubImage(GLenum target, size_t level, cons
ASSERT(target == GL_TEXTURE_2D && area.depth == 1 && area.z == 0);
gl::ImageIndex index = gl::ImageIndex::Make2D(static_cast<GLint>(level));
gl::Error error = TextureD3D::subImageCompressed(index, area, format, unpack, pixels, 0);
if (error.isError())
{
return error;
}
ANGLE_TRY(TextureD3D::subImageCompressed(index, area, format, unpack, pixels, 0));
return commitRegion(index, area);
}
......@@ -870,31 +850,18 @@ gl::Error TextureD3D_2D::copyImage(GLenum target,
// so we should use the non-rendering copy path.
if (!canCreateRenderTargetForImage(index) || mRenderer->getWorkarounds().zeroMaxLodWorkaround)
{
gl::Error error = mImageArray[level]->copyFromFramebuffer(destOffset, sourceArea, source);
if (error.isError())
{
return error;
}
ANGLE_TRY(mImageArray[level]->copyFromFramebuffer(destOffset, sourceArea, source));
mDirtyImages = true;
}
else
{
gl::Error error = ensureRenderTarget();
if (error.isError())
{
return error;
}
ANGLE_TRY(ensureRenderTarget());
mImageArray[level]->markClean();
if (sourceArea.width != 0 && sourceArea.height != 0 && isValidLevel(level))
{
error = mRenderer->copyImage2D(source, sourceArea, internalFormat, destOffset, mTexStorage, level);
if (error.isError())
{
return error;
}
ANGLE_TRY(mRenderer->copyImage2D(source, sourceArea, internalFormat, destOffset,
mTexStorage, level));
}
}
......@@ -919,37 +886,19 @@ gl::Error TextureD3D_2D::copySubImage(GLenum target,
// so we should use the non-rendering copy path.
if (!canCreateRenderTargetForImage(index) || mRenderer->getWorkarounds().zeroMaxLodWorkaround)
{
gl::Error error = mImageArray[level]->copyFromFramebuffer(destOffset, sourceArea, source);
if (error.isError())
{
return error;
}
ANGLE_TRY(mImageArray[level]->copyFromFramebuffer(destOffset, sourceArea, source));
mDirtyImages = true;
}
else
{
gl::Error error = ensureRenderTarget();
if (error.isError())
{
return error;
}
ANGLE_TRY(ensureRenderTarget());
if (isValidLevel(level))
{
error = updateStorageLevel(level);
if (error.isError())
{
return error;
}
error = mRenderer->copyImage2D(source, sourceArea,
gl::GetInternalFormatInfo(getBaseLevelInternalFormat()).format,
destOffset, mTexStorage, level);
if (error.isError())
{
return error;
}
ANGLE_TRY(updateStorageLevel(level));
ANGLE_TRY(mRenderer->copyImage2D(
source, sourceArea, gl::GetInternalFormatInfo(getBaseLevelInternalFormat()).format,
destOffset, mTexStorage, level));
}
}
......
src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
......@@ -770,11 +770,7 @@ gl::Error Blit11::copyTexture(ID3D11ShaderResourceView *source,
GLenum filter,
bool maskOffAlpha)
{
gl::Error error = initResources();
if (error.isError())
{
return error;
}
ANGLE_TRY(initResources());
HRESULT result;
ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
......@@ -794,12 +790,7 @@ gl::Error Blit11::copyTexture(ID3D11ShaderResourceView *source,
ShaderDimension dimension = (sourceSRVDesc.ViewDimension == D3D11_SRV_DIMENSION_TEXTURE3D) ? SHADER_3D : SHADER_2D;
const Shader *shader = nullptr;
error = getBlitShader(destFormat, isSigned, dimension, &shader);
if (error.isError())
{
return error;
}
ANGLE_TRY(getBlitShader(destFormat, isSigned, dimension, &shader));
const ShaderSupport &support = getShaderSupport(*shader);
// Set vertices
......@@ -905,7 +896,7 @@ gl::Error Blit11::copyTexture(ID3D11ShaderResourceView *source,
mRenderer->markAllStateDirty();
return gl::Error(GL_NO_ERROR);
return gl::NoError();
}
gl::Error Blit11::copyStencil(ID3D11Resource *source, unsigned int sourceSubresource, const gl::Box &sourceArea, const gl::Extents &sourceSize,
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.h
......@@ -424,6 +424,12 @@ class Renderer11 : public RendererD3D
size_t samplerMetadataReferencedBytes,
ID3D11Buffer *driverConstantBuffer);
gl::Error copyImageInternal(const gl::Framebuffer *framebuffer,
const gl::Rectangle &sourceRect,
GLenum destFormat,
const gl::Offset &destOffset,
RenderTargetD3D *destRenderTarget);
HMODULE mD3d11Module;
HMODULE mDxgiModule;
HMODULE mDCompModule;
......
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