Commit 7aa786c8 by Jamie Madill Committed by Commit Bot

Fix warnings produced from MSVS code analysis.

We could dereference a null pointer in a couple edge cases. BUG=angleproject:2151 Change-Id: I0d40b930c5008b80928bfe8c93588f80127fd166 Reviewed-on: https://chromium-review.googlesource.com/665995 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent b8bbbf9e
......@@ -304,7 +304,8 @@ void VertexDataManager::StoreDirectAttrib(TranslatedAttribute *directAttrib)
const auto &binding = *directAttrib->binding;
gl::Buffer *buffer = binding.getBuffer().get();
BufferD3D *bufferD3D = buffer ? GetImplAs<BufferD3D>(buffer) : nullptr;
ASSERT(buffer);
BufferD3D *bufferD3D = GetImplAs<BufferD3D>(buffer);
ASSERT(DirectStoragePossible(attrib, binding));
directAttrib->vertexBuffer.set(nullptr);
......
......@@ -1657,12 +1657,12 @@ gl::Error StateManager11::syncFramebuffer(const gl::Context *context, gl::Frameb
framebufferRTVs[appliedRTIndex] = renderTarget->getRenderTargetView().get();
ASSERT(framebufferRTVs[appliedRTIndex]);
maxExistingRT = static_cast<UINT>(appliedRTIndex) + 1;
}
// Unset conflicting texture SRVs
const auto *attachment = framebuffer->getColorbuffer(rtIndex);
ASSERT(attachment);
unsetConflictingAttachmentResources(attachment, renderTarget->getTexture().get());
// Unset conflicting texture SRVs
const auto *attachment = framebuffer->getColorbuffer(rtIndex);
ASSERT(attachment);
unsetConflictingAttachmentResources(attachment, renderTarget->getTexture().get());
}
appliedRTIndex++;
}
......
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