Pass GLImplFactory to Query constructor.

This makes the code more consistent and allows for the Query constructor to generate a Serial. Bug: angleproject:4223 Change-Id: I6cc683b11ed364f13d303f97aa0984e63260953e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1969061Reviewed-by: Cody Northrop <cnorthrop@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Pass GLImplFactory to Query constructor.
d205ee3a · Jamie Madill · Commit Bot · 545c6142 · d205ee3a · d205ee3a
Commit d205ee3a authored Dec 16, 2019 by Jamie Madill Committed by Commit Bot Dec 17, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

Context.cpp src/libANGLE/Context.cpp +1 -1

Query.cpp src/libANGLE/Query.cpp +5 -1

Query.h src/libANGLE/Query.h +3 -2

No files found.
--- a/src/libANGLE/Context.cpp
+++ b/src/libANGLE/Context.cpp
@@ -1355,7 +1355,7 @@ Query *Context::getQuery(QueryID handle, bool create, QueryType type)
    if (!query && create)
    {
        ASSERT(type != QueryType::InvalidEnum);
-        query = new Query(mImplementation->createQuery(type), handle);
+        query = new Query(mImplementation.get(), type, handle);
        query->addRef();
        mQueryMap.assign(handle, query);
    }

--- a/src/libANGLE/Query.cpp
+++ b/src/libANGLE/Query.cpp
@@ -7,11 +7,15 @@
 // Query.cpp: Implements the gl::Query class

 #include "libANGLE/Query.h"
+
+#include "libANGLE/renderer/GLImplFactory.h"
 #include "libANGLE/renderer/QueryImpl.h"

 namespace gl
 {
-Query::Query(rx::QueryImpl *impl, QueryID id) : RefCountObject(id), mQuery(impl), mLabel() {}
+Query::Query(rx::GLImplFactory *factory, QueryType type, QueryID id)
+    : RefCountObject(id), mQuery(factory->createQuery(type)), mLabel()
+{}

 Query::~Query()
 {

--- a/src/libANGLE/Query.h
+++ b/src/libANGLE/Query.h
@@ -20,8 +20,9 @@

 namespace rx
 {
+class GLImplFactory;
 class QueryImpl;
-}
+}  // namespace rx

 namespace gl
 {
@@ -29,7 +30,7 @@ namespace gl
 class Query final : public RefCountObject<QueryID>, public LabeledObject
 {
  public:
-    Query(rx::QueryImpl *impl, QueryID id);
+    Query(rx::GLImplFactory *factory, QueryType type, QueryID id);
    ~Query() override;
    void onDestroy(const Context *context) override;