Hash :
aa7203ef
Author :
Date :
2017-05-03T23:32:29
Inherit privately from angle::NonCopyable.
Make all inheritance from angle::NonCopyable private so the compiler
complains about this (admittedly unlikely) code:
class Foo: angle::NonCopyable {
virtual ~Foo() { ... }
};
angle::NonCopyable *p = new Foo;
delete p;
In the above code ~Foo() is not called, only ~NonCopyable(), because the
latter is not virtual. Making it virtual would add overhead to all derived
classes which don't already have a virtual method.
Also tighten access in NonCopyable, because we can.
BUG=angleproject:2026
Change-Id: Id0dc4d959cfb7bb82cf49382118129abb1d3a4f0
Reviewed-on: https://chromium-review.googlesource.com/495352
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Frank Henigman <fjhenigman@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
//
// Copyright (c) 2013 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// Query11.h: Defines the rx::Query11 class which implements rx::QueryImpl.
#ifndef LIBANGLE_RENDERER_D3D_D3D11_QUERY11_H_
#define LIBANGLE_RENDERER_D3D_D3D11_QUERY11_H_
#include <deque>
#include "libANGLE/renderer/QueryImpl.h"
namespace rx
{
class Renderer11;
class Query11 : public QueryImpl
{
public:
Query11(Renderer11 *renderer, GLenum type);
~Query11() override;
gl::Error begin() override;
gl::Error end() override;
gl::Error queryCounter() override;
gl::Error getResult(GLint *params) override;
gl::Error getResult(GLuint *params) override;
gl::Error getResult(GLint64 *params) override;
gl::Error getResult(GLuint64 *params) override;
gl::Error isResultAvailable(bool *available) override;
gl::Error pause();
gl::Error resume();
private:
struct QueryState final : private angle::NonCopyable
{
QueryState();
~QueryState();
ID3D11Query *query;
ID3D11Query *beginTimestamp;
ID3D11Query *endTimestamp;
bool finished;
};
gl::Error flush(bool force);
gl::Error testQuery(QueryState *queryState);
template <typename T>
gl::Error getResultBase(T *params);
GLuint64 mResult;
GLuint64 mResultSum;
Renderer11 *mRenderer;
std::unique_ptr<QueryState> mActiveQuery;
std::deque<std::unique_ptr<QueryState>> mPendingQueries;
};
}
#endif // LIBANGLE_RENDERER_D3D_D3D11_QUERY11_H_