Created Query11.

src/build_angle.gypi

@@ -286,6 +286,8 @@
             'libGLESv2/renderer/QueryImpl.h',
             'libGLESv2/renderer/Query9.cpp',
             'libGLESv2/renderer/Query9.h',
+            'libGLESv2/renderer/Query11.cpp',
+            'libGLESv2/renderer/Query11.h',
             'libGLESv2/renderer/Renderer.cpp',
             'libGLESv2/renderer/Renderer.h',
             'libGLESv2/renderer/Renderer11.cpp',

src/libGLESv2/libGLESv2.vcxproj

@@ -254,6 +254,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClCompile Include="renderer\ImageSSE2.cpp" />
     <ClCompile Include="renderer\Image11.cpp" />
     <ClCompile Include="renderer\InputLayoutCache.cpp" />
+    <ClCompile Include="renderer\Query11.cpp" />
     <ClCompile Include="renderer\Query9.cpp" />
     <ClCompile Include="renderer\Renderer.cpp" />
     <ClCompile Include="renderer\Renderer11.cpp" />
@@ -314,6 +315,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\Query11.h" />
     <ClInclude Include="renderer\QueryImpl.h" />
     <ClInclude Include="renderer\Query9.h" />
     <ClInclude Include="renderer\Renderer.h" />

src/libGLESv2/libGLESv2.vcxproj.filters

@@ -185,6 +185,9 @@
     <ClCompile Include="renderer\Fence9.cpp">
       <Filter>Renderer</Filter>
     </ClCompile>
+    <ClCompile Include="renderer\Query11.cpp">
+      <Filter>Renderer</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BinaryStream.h">
@@ -421,6 +424,15 @@
     <ClInclude Include="renderer\Fence9.h">
       <Filter>Renderer</Filter>
     </ClInclude>
+    <ClInclude Include="renderer\Fence9.h">
+      <Filter>Renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="renderer\Query11.h">
+      <Filter>Renderer</Filter>
+    </ClInclude>
+    <ClInclude Include="renderer\Query11.h">
+      <Filter>Renderer</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libGLESv2.def">

src/libGLESv2/renderer/Query11.cpp

+//
+// 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.cpp: Defines the rx::Query11 class which implements rx::QueryImpl.
+
+#include "libGLESv2/renderer/Query11.h"
+#include "libGLESv2/main.h"
+
+namespace rx
+{
+
+Query11::Query11(rx::Renderer11 *renderer, GLenum type) : QueryImpl(type)
+{
+    mRenderer = renderer;
+    mQuery = NULL;
+}
+
+Query11::~Query11()
+{
+    if (mQuery)
+    {
+        mQuery->Release();
+        mQuery = NULL;
+    }
+}
+
+void Query11::begin()
+{
+    if (mQuery == NULL)
+    {
+        D3D11_QUERY_DESC queryDesc;
+        queryDesc.Query = D3D11_QUERY_OCCLUSION;
+        queryDesc.MiscFlags = 0;
+
+        if (FAILED(mRenderer->getDevice()->CreateQuery(&queryDesc, &mQuery)))
+        {
+            return error(GL_OUT_OF_MEMORY);
+        }
+    }
+
+    mRenderer->getDeviceContext()->Begin(mQuery);
+}
+
+void Query11::end()
+{
+    if (mQuery == NULL)
+    {
+        return error(GL_INVALID_OPERATION);
+    }
+
+    mRenderer->getDeviceContext()->End(mQuery);
+
+    setStatus(GL_FALSE);
+    setResult(GL_FALSE);
+}
+
+GLuint Query11::getResult()
+{
+    if (mQuery != NULL)
+    {
+        while (!testQuery())
+        {
+            Sleep(0);
+            // explicitly check for device loss, some drivers seem to return S_FALSE
+            // if the device is lost
+            if (mRenderer->testDeviceLost(true))
+            {
+                return error(GL_OUT_OF_MEMORY, 0);
+            }
+        }
+    }
+
+    return getResult();
+}
+
+GLboolean Query11::isResultAvailable()
+{
+    if (mQuery != NULL)
+    {
+        testQuery();
+    }
+
+    return getStatus();
+}
+
+GLboolean Query11::testQuery()
+{
+    if (mQuery != NULL && getStatus() != GL_TRUE)
+    {
+        UINT64 numPixels = 0;
+        HRESULT result = mRenderer->getDeviceContext()->GetData(mQuery, &numPixels, sizeof(UINT64), 0);
+        if (result == S_OK)
+        {
+            setStatus(GL_TRUE);
+
+            switch (getType())
+            {
+              case GL_ANY_SAMPLES_PASSED_EXT:
+              case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:
+                setResult((numPixels > 0) ? GL_TRUE : GL_FALSE);
+                break;
+              default:
+                UNREACHABLE();
+            }
+        }
+        else if (mRenderer->testDeviceLost(true))
+        {
+            return error(GL_OUT_OF_MEMORY, GL_TRUE);
+        }
+
+        return getStatus();
+    }
+
+    return GL_TRUE; // prevent blocking when query is null
+}
+
+}

src/libGLESv2/renderer/Query11.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.
+//
+
+// Query11.h: Defines the rx::Query11 class which implements rx::QueryImpl.
+
+#ifndef LIBGLESV2_RENDERER_QUERY11_H_
+#define LIBGLESV2_RENDERER_QUERY11_H_
+
+#include "libGLESv2/renderer/QueryImpl.h"
+#include "libGLESv2/renderer/Renderer11.h"
+
+namespace rx
+{
+
+class Query11 : public QueryImpl
+{
+  public:
+    Query11(rx::Renderer11 *renderer, GLenum type);
+    virtual ~Query11();
+
+    void begin();
+    void end();
+    GLuint getResult();
+    GLboolean isResultAvailable();
+
+  private:
+    DISALLOW_COPY_AND_ASSIGN(Query11);
+
+    GLboolean testQuery();
+
+    rx::Renderer11 *mRenderer;
+    ID3D11Query *mQuery;
+};
+
+}
+
+#endif // LIBGLESV2_RENDERER_QUERY11_H_

src/libGLESv2/renderer/Renderer11.cpp

@@ -25,6 +25,7 @@
 #include "libGLESv2/renderer/VertexDataManager.h"
 #include "libGLESv2/renderer/IndexDataManager.h"
 #include "libGLESv2/renderer/TextureStorage11.h"
+#include "libGLESv2/renderer/Query11.h"
 
 #include "libGLESv2/renderer/shaders/compiled/passthrough11vs.h"
 #include "libGLESv2/renderer/shaders/compiled/passthroughrgba11ps.h"
@@ -1984,9 +1985,15 @@ bool Renderer11::getNonPower2TextureSupport() const
 
 bool Renderer11::getOcclusionQuerySupport() const
 {
-    // TODO
-    // UNIMPLEMENTED();
-    return false;
+    switch (mFeatureLevel)
+    {
+      case D3D_FEATURE_LEVEL_11_0:
+      case D3D_FEATURE_LEVEL_10_1:
+      case D3D_FEATURE_LEVEL_10_0:
+        return true;
+      default: UNREACHABLE();
+        return false;
+    }
 }
 
 bool Renderer11::getInstancingSupport() const
@@ -2551,9 +2558,7 @@ IndexBuffer *Renderer11::createIndexBuffer()
 
 QueryImpl *Renderer11::createQuery(GLenum type)
 {
-    // TODO
-    UNIMPLEMENTED();
-    return NULL;
+    return new Query11(this, type);
 }
 
 FenceImpl *Renderer11::createFence()