Commit ec0a7028 by Jamie Madill Committed by Commit Bot

D3D11: Add more debug names.

Bug: None Change-Id: Iedf69564f465ad1a48fd5cebfe384ace6787a720 Reviewed-on: https://chromium-review.googlesource.com/1006050Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 3e1302bd
...@@ -2520,6 +2520,7 @@ gl::Error Renderer11::createRenderTarget(int width, ...@@ -2520,6 +2520,7 @@ gl::Error Renderer11::createRenderTarget(int width,
TextureHelper11 texture; TextureHelper11 texture;
ANGLE_TRY(allocateTexture(desc, formatInfo, &texture)); ANGLE_TRY(allocateTexture(desc, formatInfo, &texture));
texture.setDebugName("createRenderTarget.Texture");
d3d11::SharedSRV srv; d3d11::SharedSRV srv;
d3d11::SharedSRV blitSRV; d3d11::SharedSRV blitSRV;
...@@ -2533,6 +2534,7 @@ gl::Error Renderer11::createRenderTarget(int width, ...@@ -2533,6 +2534,7 @@ gl::Error Renderer11::createRenderTarget(int width,
srvDesc.Texture2D.MipLevels = 1; srvDesc.Texture2D.MipLevels = 1;
ANGLE_TRY(allocateResource(srvDesc, texture.get(), &srv)); ANGLE_TRY(allocateResource(srvDesc, texture.get(), &srv));
srv.setDebugName("createRenderTarget.SRV");
if (formatInfo.blitSRVFormat != formatInfo.srvFormat) if (formatInfo.blitSRVFormat != formatInfo.srvFormat)
{ {
...@@ -2545,6 +2547,7 @@ gl::Error Renderer11::createRenderTarget(int width, ...@@ -2545,6 +2547,7 @@ gl::Error Renderer11::createRenderTarget(int width,
blitSRVDesc.Texture2D.MipLevels = 1; blitSRVDesc.Texture2D.MipLevels = 1;
ANGLE_TRY(allocateResource(blitSRVDesc, texture.get(), &blitSRV)); ANGLE_TRY(allocateResource(blitSRVDesc, texture.get(), &blitSRV));
blitSRV.setDebugName("createRenderTarget.BlitSRV");
} }
else else
{ {
...@@ -2563,6 +2566,7 @@ gl::Error Renderer11::createRenderTarget(int width, ...@@ -2563,6 +2566,7 @@ gl::Error Renderer11::createRenderTarget(int width,
d3d11::DepthStencilView dsv; d3d11::DepthStencilView dsv;
ANGLE_TRY(allocateResource(dsvDesc, texture.get(), &dsv)); ANGLE_TRY(allocateResource(dsvDesc, texture.get(), &dsv));
dsv.setDebugName("createRenderTarget.DSV");
*outRT = new TextureRenderTarget11(std::move(dsv), texture, srv, format, formatInfo, *outRT = new TextureRenderTarget11(std::move(dsv), texture, srv, format, formatInfo,
width, height, 1, supportedSamples); width, height, 1, supportedSamples);
...@@ -2577,6 +2581,7 @@ gl::Error Renderer11::createRenderTarget(int width, ...@@ -2577,6 +2581,7 @@ gl::Error Renderer11::createRenderTarget(int width,
d3d11::RenderTargetView rtv; d3d11::RenderTargetView rtv;
ANGLE_TRY(allocateResource(rtvDesc, texture.get(), &rtv)); ANGLE_TRY(allocateResource(rtvDesc, texture.get(), &rtv));
rtv.setDebugName("createRenderTarget.RTV");
if (formatInfo.dataInitializerFunction != nullptr) if (formatInfo.dataInitializerFunction != nullptr)
{ {
...@@ -3051,6 +3056,7 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context, ...@@ -3051,6 +3056,7 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context,
createStagingTexture(textureHelper.getTextureType(), textureHelper.getFormatSet(), safeSize, createStagingTexture(textureHelper.getTextureType(), textureHelper.getFormatSet(), safeSize,
StagingAccess::READ), StagingAccess::READ),
stagingHelper); stagingHelper);
stagingHelper.setDebugName("readFromAttachment::stagingHelper");
TextureHelper11 resolvedTextureHelper; TextureHelper11 resolvedTextureHelper;
...@@ -3075,6 +3081,7 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context, ...@@ -3075,6 +3081,7 @@ gl::Error Renderer11::readFromAttachment(const gl::Context *context,
ANGLE_TRY( ANGLE_TRY(
allocateTexture(resolveDesc, textureHelper.getFormatSet(), &resolvedTextureHelper)); allocateTexture(resolveDesc, textureHelper.getFormatSet(), &resolvedTextureHelper));
resolvedTextureHelper.setDebugName("readFromAttachment::resolvedTextureHelper");
mDeviceContext->ResolveSubresource(resolvedTextureHelper.get(), 0, textureHelper.get(), mDeviceContext->ResolveSubresource(resolvedTextureHelper.get(), 0, textureHelper.get(),
sourceSubResource, textureHelper.getFormat()); sourceSubResource, textureHelper.getFormat());
......
...@@ -1109,7 +1109,15 @@ gl::Error TextureStorage11_2D::ensureTextureExists(int mipLevels) ...@@ -1109,7 +1109,15 @@ gl::Error TextureStorage11_2D::ensureTextureExists(int mipLevels)
desc.MiscFlags = getMiscFlags(); desc.MiscFlags = getMiscFlags();
ANGLE_TRY(mRenderer->allocateTexture(desc, mFormatInfo, outputTexture)); ANGLE_TRY(mRenderer->allocateTexture(desc, mFormatInfo, outputTexture));
outputTexture->setDebugName("TexStorage2D.Texture");
if (useLevelZeroTexture)
{
outputTexture->setDebugName("TexStorage2D.Level0Texture");
}
else
{
outputTexture->setDebugName("TexStorage2D.Texture");
}
} }
return gl::NoError(); return gl::NoError();
...@@ -1166,6 +1174,7 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context, ...@@ -1166,6 +1174,7 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
d3d11::RenderTargetView rtv; d3d11::RenderTargetView rtv;
ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mLevelZeroTexture.get(), &rtv)); ANGLE_TRY(mRenderer->allocateResource(rtvDesc, mLevelZeroTexture.get(), &rtv));
rtv.setDebugName("TexStorage2D.Level0RTV");
mLevelZeroRenderTarget.reset(new TextureRenderTarget11( mLevelZeroRenderTarget.reset(new TextureRenderTarget11(
std::move(rtv), mLevelZeroTexture, d3d11::SharedSRV(), d3d11::SharedSRV(), std::move(rtv), mLevelZeroTexture, d3d11::SharedSRV(), d3d11::SharedSRV(),
...@@ -1186,6 +1195,7 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context, ...@@ -1186,6 +1195,7 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
d3d11::RenderTargetView rtv; d3d11::RenderTargetView rtv;
ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv)); ANGLE_TRY(mRenderer->allocateResource(rtvDesc, texture->get(), &rtv));
rtv.setDebugName("TexStorage2D.RTV");
mRenderTarget[level].reset(new TextureRenderTarget11( mRenderTarget[level].reset(new TextureRenderTarget11(
std::move(rtv), *texture, *srv, *blitSRV, mFormatInfo.internalFormat, getFormatSet(), std::move(rtv), *texture, *srv, *blitSRV, mFormatInfo.internalFormat, getFormatSet(),
...@@ -1205,6 +1215,7 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context, ...@@ -1205,6 +1215,7 @@ gl::Error TextureStorage11_2D::getRenderTarget(const gl::Context *context,
d3d11::DepthStencilView dsv; d3d11::DepthStencilView dsv;
ANGLE_TRY(mRenderer->allocateResource(dsvDesc, texture->get(), &dsv)); ANGLE_TRY(mRenderer->allocateResource(dsvDesc, texture->get(), &dsv));
dsv.setDebugName("TexStorage2D.DSV");
mRenderTarget[level].reset(new TextureRenderTarget11( mRenderTarget[level].reset(new TextureRenderTarget11(
std::move(dsv), *texture, *srv, mFormatInfo.internalFormat, getFormatSet(), std::move(dsv), *texture, *srv, mFormatInfo.internalFormat, getFormatSet(),
......
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