Created an abstract rx::QueryImpl class.

src/build_angle.gypi

@@ -280,6 +280,7 @@
             'libGLESv2/renderer/IndexDataManager.h',
             'libGLESv2/renderer/InputLayoutCache.cpp',
             'libGLESv2/renderer/InputLayoutCache.h',
+            'libGLESv2/renderer/QueryImpl.h',
             'libGLESv2/renderer/Renderer.cpp',
             'libGLESv2/renderer/Renderer.h',
             'libGLESv2/renderer/Renderer11.cpp',

src/libGLESv2/libGLESv2.vcxproj

@@ -310,6 +310,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClInclude Include="renderer\IndexBuffer9.h" />
     <ClInclude Include="renderer\IndexDataManager.h" />
     <ClInclude Include="renderer\InputLayoutCache.h" />
+    <ClInclude Include="renderer\QueryImpl.h" />
     <ClInclude Include="renderer\Renderer.h" />
     <ClInclude Include="renderer\Renderer11.h" />
     <ClInclude Include="renderer\renderer11_utils.h" />

src/libGLESv2/libGLESv2.vcxproj.filters

@@ -403,6 +403,9 @@
     <ClInclude Include="..\common\debug.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="renderer\QueryImpl.h">
+      <Filter>Renderer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libGLESv2.def">

src/libGLESv2/renderer/QueryImpl.h

+//
+// 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.
+//
+
+// QueryImpl.h: Defines the abstract rx::QueryImpl class.
+
+#ifndef LIBGLESV2_RENDERER_QUERYIMPL_H_
+#define LIBGLESV2_RENDERER_QUERYIMPL_H_
+
+#define GL_APICALL
+#include <GLES2/gl2.h>
+
+#include "common/angleutils.h"
+
+namespace rx
+{
+
+class QueryImpl
+{
+  public:
+    explicit QueryImpl(GLenum type) : mType(type), mStatus(GL_FALSE), mResult(0) { }
+    virtual ~QueryImpl() { }
+
+    virtual void begin() = 0;
+    virtual void end() = 0;
+    virtual GLuint getResult() = 0;
+    virtual GLboolean isResultAvailable() = 0;
+
+    GLenum getType() const { return mType; }
+
+  protected:
+    void setStatus(GLboolean status) { mStatus = status; }
+    GLboolean getStatus() const { return mStatus; }
+
+    void setResult(GLuint result) { mResult = result; }
+    GLuint getResult() const { return mResult; }
+
+  private:
+    DISALLOW_COPY_AND_ASSIGN(QueryImpl);
+
+    GLenum mType;
+    GLboolean mStatus;
+    GLuint mResult;
+};
+
+}
+
+#endif // LIBGLESV2_RENDERER_QUERYIMPL_H_