Upgrade ANGLE to DX11 Proto

Upgrades ANGLE to dx11proto (dx11-MRT-support tag), which splits out support
for DirectX9 & DirectX11. The DX9 codepath is used by default;
CONFIG+=angle_d3d11 must be passed to the ANGLE project to build for DX11.
Existing patches to ANGLE have been updated (or removed if no longer
needed), and a patch has been added to make DX9/DX11 codepaths mutually
exclusive.

Change-Id: Ibe13befadb94f04883eca449d0ee1f0da955ff92
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Axel Waggershauser <awagger@gmail.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/src/3rdparty/angle/src/libGLESv2/Query.h b/src/3rdparty/angle/src/libGLESv2/Query.h
index 79357a0583..e9b95b729b 100644
--- a/src/3rdparty/angle/src/libGLESv2/Query.h
+++ b/src/3rdparty/angle/src/libGLESv2/Query.h
@@ -11,22 +11,28 @@
 
 #define GL_APICALL
 #include <GLES2/gl2.h>
-#include <d3d9.h>
 
 #include "common/angleutils.h"
 #include "common/RefCountObject.h"
 
+namespace rx
+{
+class Renderer;
+class QueryImpl;
+}
+
 namespace gl
 {
 
 class Query : public RefCountObject
 {
   public:
-    Query(GLuint id, GLenum type);
+    Query(rx::Renderer *renderer, GLenum type, GLuint id);
     virtual ~Query();
 
     void begin();
     void end();
+
     GLuint getResult();
     GLboolean isResultAvailable();
 
@@ -35,12 +41,7 @@ class Query : public RefCountObject
   private:
     DISALLOW_COPY_AND_ASSIGN(Query);
 
-    GLboolean testQuery();
-
-    IDirect3DQuery9* mQuery;
-    GLenum mType;
-    GLboolean mStatus;
-    GLint mResult;
+    rx::QueryImpl *mQuery;
 };
 
 }