Commit 44897140 by Nico Weber

clang/win: Fix -Wunused-private-field warnings in debug builds.

No intended behavior change. BUG=505317 Change-Id: I5dfa1d67715b18133f3373ca00a6d1d96b678043 Reviewed-on: https://chromium-review.googlesource.com/284850Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Tested-by: 's avatarNico Weber <thakis@chromium.org>
parent 07e57df7
...@@ -105,6 +105,7 @@ class PullGradient : public TIntermTraverser ...@@ -105,6 +105,7 @@ class PullGradient : public TIntermTraverser
{ {
size_t calleeIndex = mDag.findIndex(node); size_t calleeIndex = mDag.findIndex(node);
ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex); ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex);
UNUSED_ASSERTION_VARIABLE(mIndex);
if ((*mMetadataList)[calleeIndex].mUsesGradient) { if ((*mMetadataList)[calleeIndex].mUsesGradient) {
onGradient(); onGradient();
...@@ -271,6 +272,7 @@ class PullComputeDiscontinuousLoops : public TIntermTraverser ...@@ -271,6 +272,7 @@ class PullComputeDiscontinuousLoops : public TIntermTraverser
{ {
size_t calleeIndex = mDag.findIndex(node); size_t calleeIndex = mDag.findIndex(node);
ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex); ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex);
UNUSED_ASSERTION_VARIABLE(mIndex);
if ((*mMetadataList)[calleeIndex].mHasDiscontinuousLoopInCallGraph) if ((*mMetadataList)[calleeIndex].mHasDiscontinuousLoopInCallGraph)
{ {
...@@ -351,6 +353,7 @@ class PushDiscontinuousLoops : public TIntermTraverser ...@@ -351,6 +353,7 @@ class PushDiscontinuousLoops : public TIntermTraverser
{ {
size_t calleeIndex = mDag.findIndex(node); size_t calleeIndex = mDag.findIndex(node);
ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex); ASSERT(calleeIndex != CallDAG::InvalidIndex && calleeIndex < mIndex);
UNUSED_ASSERTION_VARIABLE(mIndex);
(*mMetadataList)[calleeIndex].mCalledInDiscontinuousLoop = true; (*mMetadataList)[calleeIndex].mCalledInDiscontinuousLoop = true;
} }
......
...@@ -84,13 +84,11 @@ ClearParameters GetClearParameters(const gl::State &state, GLbitfield mask) ...@@ -84,13 +84,11 @@ ClearParameters GetClearParameters(const gl::State &state, GLbitfield mask)
} }
FramebufferD3D::FramebufferD3D(const gl::Framebuffer::Data &data, RendererD3D *renderer) FramebufferD3D::FramebufferD3D(const gl::Framebuffer::Data &data)
: FramebufferImpl(data), : FramebufferImpl(data),
mColorAttachmentsForRender(mData.getColorAttachments().size(), nullptr), mColorAttachmentsForRender(mData.getColorAttachments().size(), nullptr),
mInvalidateColorAttachmentCache(true), mInvalidateColorAttachmentCache(true)
mRenderer(renderer)
{ {
ASSERT(mRenderer != nullptr);
} }
FramebufferD3D::~FramebufferD3D() FramebufferD3D::~FramebufferD3D()
......
...@@ -27,7 +27,6 @@ typedef std::vector<const FramebufferAttachment *> AttachmentList; ...@@ -27,7 +27,6 @@ typedef std::vector<const FramebufferAttachment *> AttachmentList;
namespace rx namespace rx
{ {
class RenderTargetD3D; class RenderTargetD3D;
class RendererD3D;
struct ClearParameters struct ClearParameters
{ {
...@@ -55,7 +54,7 @@ struct ClearParameters ...@@ -55,7 +54,7 @@ struct ClearParameters
class FramebufferD3D : public FramebufferImpl class FramebufferD3D : public FramebufferImpl
{ {
public: public:
FramebufferD3D(const gl::Framebuffer::Data &data, RendererD3D *renderer); FramebufferD3D(const gl::Framebuffer::Data &data);
virtual ~FramebufferD3D(); virtual ~FramebufferD3D();
void onUpdateColorAttachment(size_t index) override; void onUpdateColorAttachment(size_t index) override;
...@@ -89,8 +88,6 @@ class FramebufferD3D : public FramebufferImpl ...@@ -89,8 +88,6 @@ class FramebufferD3D : public FramebufferImpl
mutable bool mInvalidateColorAttachmentCache; mutable bool mInvalidateColorAttachmentCache;
private: private:
RendererD3D *const mRenderer;
virtual gl::Error clear(const gl::State &state, const ClearParameters &clearParams) = 0; virtual gl::Error clear(const gl::State &state, const ClearParameters &clearParams) = 0;
virtual gl::Error readPixels(const gl::Rectangle &area, GLenum format, GLenum type, size_t outputPitch, virtual gl::Error readPixels(const gl::Rectangle &area, GLenum format, GLenum type, size_t outputPitch,
......
...@@ -25,7 +25,7 @@ namespace rx ...@@ -25,7 +25,7 @@ namespace rx
{ {
Framebuffer11::Framebuffer11(const gl::Framebuffer::Data &data, Renderer11 *renderer) Framebuffer11::Framebuffer11(const gl::Framebuffer::Data &data, Renderer11 *renderer)
: FramebufferD3D(data, renderer), : FramebufferD3D(data),
mRenderer(renderer) mRenderer(renderer)
{ {
ASSERT(mRenderer != nullptr); ASSERT(mRenderer != nullptr);
......
...@@ -22,7 +22,7 @@ namespace rx ...@@ -22,7 +22,7 @@ namespace rx
{ {
Framebuffer9::Framebuffer9(const gl::Framebuffer::Data &data, Renderer9 *renderer) Framebuffer9::Framebuffer9(const gl::Framebuffer::Data &data, Renderer9 *renderer)
: FramebufferD3D(data, renderer), : FramebufferD3D(data),
mRenderer(renderer) mRenderer(renderer)
{ {
ASSERT(mRenderer != nullptr); ASSERT(mRenderer != nullptr);
......
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