Added query creation methods to Renderer.

src/libGLESv2/renderer/Renderer.h

@@ -56,6 +56,7 @@ class TextureStorageInterface2D;
 class TextureStorageInterfaceCube;
 class VertexBuffer;
 class IndexBuffer;
+class QueryImpl;
 class Blit;
 struct TranslatedIndexData;
 
@@ -208,6 +209,9 @@ class Renderer
     virtual VertexBuffer *createVertexBuffer() = 0;
     virtual IndexBuffer *createIndexBuffer() = 0;
 
+    // Query creation
+    virtual QueryImpl *createQuery(GLenum type) = 0;
+
   protected:
     bool initializeCompiler();
     ID3DBlob *compileToBinary(gl::InfoLog &infoLog, const char *hlsl, const char *profile, bool alternateFlags);

src/libGLESv2/renderer/Renderer11.cpp

@@ -2547,6 +2547,13 @@ VertexBuffer *Renderer11::createVertexBuffer()
 IndexBuffer *Renderer11::createIndexBuffer()
 {
     return new IndexBuffer11(this);
+}
+
+QueryImpl *Renderer11::createQuery(GLenum type)
+{
+    // TODO
+    UNIMPLEMENTED();
+    return NULL;
 }
 
 bool Renderer11::getRenderTargetResource(gl::Framebuffer *framebuffer, unsigned int *subresourceIndex, ID3D11Texture2D **resource)

src/libGLESv2/renderer/Renderer11.h

@@ -164,6 +164,9 @@ class Renderer11 : public Renderer
     virtual VertexBuffer *createVertexBuffer();
     virtual IndexBuffer *createIndexBuffer();
 
+    // Query creation
+    virtual QueryImpl *createQuery(GLenum type);
+
     // D3D11-renderer specific methods
     ID3D11Device *getDevice() { return mDevice; }
     ID3D11DeviceContext *getDeviceContext() { return mDeviceContext; };

src/libGLESv2/renderer/Renderer9.cpp

@@ -26,6 +26,7 @@
 #include "libGLESv2/renderer/RenderTarget9.h"
 #include "libGLESv2/renderer/VertexBuffer9.h"
 #include "libGLESv2/renderer/IndexBuffer9.h"
+#include "libGLESv2/renderer/Query9.h"
 
 #include <sstream>
 
@@ -705,6 +706,11 @@ IndexBuffer *Renderer9::createIndexBuffer()
     return new IndexBuffer9(this);
 }
 
+QueryImpl *Renderer9::createQuery(GLenum type)
+{
+    return new Query9(this, type);
+}
+
 void Renderer9::setSamplerState(gl::SamplerType type, int index, const gl::SamplerState &samplerState)
 {
     bool *forceSetSamplers = (type == gl::SAMPLER_PIXEL) ? mForceSetPixelSamplerStates : mForceSetVertexSamplerStates;

src/libGLESv2/renderer/Renderer9.h

@@ -194,6 +194,9 @@ class Renderer9 : public Renderer
     virtual VertexBuffer *createVertexBuffer();
     virtual IndexBuffer *createIndexBuffer();
 
+    // Query creation
+    virtual QueryImpl *createQuery(GLenum type);
+
     // D3D9-renderer specific methods
     bool boxFilter(IDirect3DSurface9 *source, IDirect3DSurface9 *dest);