Skip to content

A
angle
Commit 20d6d48c by Jamie Madill Committed by Commit Bot
Options

D3D11: Make createStagingTexture return Error.

This removes the use of the ErrorOrResult pattern in Renderer11. Bug: angleproject:2738 Change-Id: Icc046ddd86394df56ca1acd10b1804fd6afa8ad0 Reviewed-on: https://chromium-review.googlesource.com/1142953Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent df0e48fe
Showing with 25 additions and 33 deletions
src/libANGLE/renderer/d3d/d3d11/Blit11.cpp
...@@ -1473,9 +1473,8 @@ gl::Error Blit11::copyAndConvertImpl(const TextureHelper11 &source, ...@@ -1473,9 +1473,8 @@ gl::Error Blit11::copyAndConvertImpl(const TextureHelper11 &source,
ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext(); ID3D11DeviceContext *deviceContext = mRenderer->getDeviceContext();
TextureHelper11 sourceStaging; TextureHelper11 sourceStaging;
ANGLE_TRY_RESULT(mRenderer->createStagingTexture(ResourceType::Texture2D, source.getFormatSet(), ANGLE_TRY(mRenderer->createStagingTexture(ResourceType::Texture2D, source.getFormatSet(),
sourceSize, StagingAccess::READ), sourceSize, StagingAccess::READ, &sourceStaging));
sourceStaging);
deviceContext->CopySubresourceRegion(sourceStaging.get(), 0, 0, 0, 0, source.get(), deviceContext->CopySubresourceRegion(sourceStaging.get(), 0, 0, 0, 0, source.get(),
sourceSubresource, nullptr); sourceSubresource, nullptr);
...@@ -1539,9 +1538,8 @@ gl::Error Blit11::copyAndConvert(const TextureHelper11 &source, ...@@ -1539,9 +1538,8 @@ gl::Error Blit11::copyAndConvert(const TextureHelper11 &source,
// ID3D11DevicContext::UpdateSubresource can be called // ID3D11DevicContext::UpdateSubresource can be called
// using it's mapped data as a source // using it's mapped data as a source
TextureHelper11 destStaging; TextureHelper11 destStaging;
ANGLE_TRY_RESULT(mRenderer->createStagingTexture(ResourceType::Texture2D, dest.getFormatSet(), ANGLE_TRY(mRenderer->createStagingTexture(ResourceType::Texture2D, dest.getFormatSet(),
destSize, StagingAccess::READ_WRITE), destSize, StagingAccess::READ_WRITE, &destStaging));
destStaging);
deviceContext->CopySubresourceRegion(destStaging.get(), 0, 0, 0, 0, dest.get(), destSubresource, deviceContext->CopySubresourceRegion(destStaging.get(), 0, 0, 0, 0, dest.get(), destSubresource,
nullptr); nullptr);
...@@ -2215,10 +2213,8 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveStencil(const gl::Context *con ...@@ -2215,10 +2213,8 @@ gl::ErrorOrResult<TextureHelper11> Blit11::resolveStencil(const gl::Context *con
gl::Box copyBox(0, 0, 0, extents.width, extents.height, 1); gl::Box copyBox(0, 0, 0, extents.width, extents.height, 1);
TextureHelper11 dest; TextureHelper11 dest;
ANGLE_TRY_RESULT( ANGLE_TRY(mRenderer->createStagingTexture(ResourceType::Texture2D, depthStencil->getFormatSet(),
mRenderer->createStagingTexture(ResourceType::Texture2D, depthStencil->getFormatSet(), extents, StagingAccess::READ_WRITE, &dest));
extents, StagingAccess::READ_WRITE),
dest);
const auto &copyFunction = GetCopyDepthStencilFunction(depthStencil->getInternalFormat()); const auto &copyFunction = GetCopyDepthStencilFunction(depthStencil->getInternalFormat());
const auto &dsFormatSet = depthStencil->getFormatSet(); const auto &dsFormatSet = depthStencil->getFormatSet();
......
src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp
...@@ -1471,10 +1471,9 @@ gl::Error Buffer11::PackStorage::packPixels(const gl::Context *context, ...@@ -1471,10 +1471,9 @@ gl::Error Buffer11::PackStorage::packPixels(const gl::Context *context,
if (!mStagingTexture.get() || mStagingTexture.getFormat() != srcTexture.getFormat() || if (!mStagingTexture.get() || mStagingTexture.getFormat() != srcTexture.getFormat() ||
mStagingTexture.getExtents() != srcTextureSize) mStagingTexture.getExtents() != srcTextureSize)
{ {
ANGLE_TRY_RESULT( ANGLE_TRY(mRenderer->createStagingTexture(srcTexture.getTextureType(),
mRenderer->createStagingTexture(srcTexture.getTextureType(), srcTexture.getFormatSet(), srcTexture.getFormatSet(), srcTextureSize,
srcTextureSize, StagingAccess::READ), StagingAccess::READ, &mStagingTexture));
mStagingTexture);
} }
// ReadPixels from multisampled FBOs isn't supported in current GL // ReadPixels from multisampled FBOs isn't supported in current GL
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
...@@ -3064,10 +3064,8 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context, ...@@ -3064,10 +3064,8 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context,
gl::Extents safeSize(safeArea.width, safeArea.height, 1); gl::Extents safeSize(safeArea.width, safeArea.height, 1);
TextureHelper11 stagingHelper; TextureHelper11 stagingHelper;
ANGLE_TRY_RESULT( ANGLE_TRY(createStagingTexture(textureHelper.getTextureType(), textureHelper.getFormatSet(),
createStagingTexture(textureHelper.getTextureType(), textureHelper.getFormatSet(), safeSize, safeSize, StagingAccess::READ, &stagingHelper));
StagingAccess::READ),
stagingHelper);
stagingHelper.setDebugName("readFromAttachment::stagingHelper"); stagingHelper.setDebugName("readFromAttachment::stagingHelper");
TextureHelper11 resolvedTextureHelper; TextureHelper11 resolvedTextureHelper;
...@@ -3694,11 +3692,11 @@ gl::Error Renderer11::dispatchCompute(const gl::Context *context, ...@@ -3694,11 +3692,11 @@ gl::Error Renderer11::dispatchCompute(const gl::Context *context,
return gl::NoError(); return gl::NoError();
} }
gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture( gl::Error Renderer11::createStagingTexture(ResourceType textureType,
ResourceType textureType, const d3d11::Format &formatSet,
const d3d11::Format &formatSet, const gl::Extents &size,
const gl::Extents &size, StagingAccess readAndWriteAccess,
StagingAccess readAndWriteAccess) TextureHelper11 *textureOut)
{ {
if (textureType == ResourceType::Texture2D) if (textureType == ResourceType::Texture2D)
{ {
...@@ -3720,9 +3718,8 @@ gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture( ...@@ -3720,9 +3718,8 @@ gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture(
stagingDesc.CPUAccessFlags |= D3D11_CPU_ACCESS_WRITE; stagingDesc.CPUAccessFlags |= D3D11_CPU_ACCESS_WRITE;
} }
TextureHelper11 stagingTex; ANGLE_TRY(allocateTexture(stagingDesc, formatSet, textureOut));
ANGLE_TRY(allocateTexture(stagingDesc, formatSet, &stagingTex)); return gl::NoError();
return stagingTex;
} }
ASSERT(textureType == ResourceType::Texture3D); ASSERT(textureType == ResourceType::Texture3D);
...@@ -3737,9 +3734,8 @@ gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture( ...@@ -3737,9 +3734,8 @@ gl::ErrorOrResult<TextureHelper11> Renderer11::createStagingTexture(
stagingDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; stagingDesc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
stagingDesc.MiscFlags = 0; stagingDesc.MiscFlags = 0;
TextureHelper11 stagingTex; ANGLE_TRY(allocateTexture(stagingDesc, formatSet, textureOut));
ANGLE_TRY(allocateTexture(stagingDesc, formatSet, &stagingTex)); return gl::NoError();
return stagingTex;
} }
gl::Error Renderer11::allocateTexture(const D3D11_TEXTURE2D_DESC &desc, gl::Error Renderer11::allocateTexture(const D3D11_TEXTURE2D_DESC &desc,
......
src/libANGLE/renderer/d3d/d3d11/Renderer11.h
...@@ -395,10 +395,11 @@ class Renderer11 : public RendererD3D ...@@ -395,10 +395,11 @@ class Renderer11 : public RendererD3D
GLuint numGroupsZ); GLuint numGroupsZ);
gl::Error applyComputeShader(const gl::Context *context); gl::Error applyComputeShader(const gl::Context *context);
gl::ErrorOrResult<TextureHelper11> createStagingTexture(ResourceType textureType, gl::Error createStagingTexture(ResourceType textureType,
const d3d11::Format &formatSet, const d3d11::Format &formatSet,
const gl::Extents &size, const gl::Extents &size,
StagingAccess readAndWriteAccess); StagingAccess readAndWriteAccess,
TextureHelper11 *textureOut);
template <typename DescT, typename ResourceT> template <typename DescT, typename ResourceT>
gl::Error allocateResource(const DescT &desc, ResourceT *resourceOut) gl::Error allocateResource(const DescT &desc, ResourceT *resourceOut)
......
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