commit ad3ae90a00f1c75ab97cb8f4283340d54aaaceb1
author Corentin Wallez <cwallez@chromium.org> Fri Mar 09 13:40:42 2018 -0500
committer Commit Bot <commit-bot@chromium.org> Wed May 02 18:33:46 2018 +0000
tree 00ed594da58f2043ab176defdd7b87d4b6eca0d1
parent 9aef36705b6653d61fee7e79dac188c279bff5ed

Use packed enums for QueryType.

BUG=angleproject:2169

Change-Id: I129a9d8e295859daa071a298dab9fe1895315cc0
Reviewed-on: https://chromium-review.googlesource.com/957318
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/renderer/QueryImpl.h

diff --git a/src/libANGLE/renderer/QueryImpl.h b/src/libANGLE/renderer/QueryImpl.h
index d738eb4..9a90bf5 100644
--- a/src/libANGLE/renderer/QueryImpl.h
+++ b/src/libANGLE/renderer/QueryImpl.h
@@ -9,11 +9,10 @@
 #ifndef LIBANGLE_RENDERER_QUERYIMPL_H_
 #define LIBANGLE_RENDERER_QUERYIMPL_H_
 
-#include "libANGLE/Error.h"
 
 #include "common/angleutils.h"
-
-#include <GLES2/gl2.h>
+#include "libANGLE/Error.h"
+#include "libANGLE/PackedEnums.h"
 
 namespace rx
 {
@@ -21,7 +20,7 @@
 class QueryImpl : angle::NonCopyable
 {
   public:
-    explicit QueryImpl(GLenum type) { mType = type; }
+    explicit QueryImpl(gl::QueryType type) { mType = type; }
     virtual ~QueryImpl() { }
 
     virtual gl::Error begin() = 0;
@@ -33,10 +32,10 @@
     virtual gl::Error getResult(GLuint64 *params) = 0;
     virtual gl::Error isResultAvailable(bool *available) = 0;
 
-    GLenum getType() const { return mType;  }
+    gl::QueryType getType() const { return mType; }
 
   private:
-    GLenum mType;
+    gl::QueryType mType;
 };
 
 }