commit ef21ab295564e9577d30fb389eec67ca71b42be1
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 17:52:47 2012 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Wed Oct 31 17:52:47 2012 +0000
tree 5e26c2be4c7eff73b0ba994b56e177a28c941e0f
parent 313e3924ac93f7ae750951849473442134f9ef84

Move query and sync support to Renderer

Trac #21727

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1331 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Query.cpp

diff --git a/src/libGLESv2/Query.cpp b/src/libGLESv2/Query.cpp
index b6fa1de..dd6280d 100644
--- a/src/libGLESv2/Query.cpp
+++ b/src/libGLESv2/Query.cpp
@@ -13,8 +13,9 @@
 namespace gl
 {
 
-Query::Query(GLuint id, GLenum type) : RefCountObject(id)
+Query::Query(renderer::Renderer *renderer, GLuint id, GLenum type) : RefCountObject(id)
 { 
+    mRenderer = renderer;
     mQuery = NULL;
     mStatus = GL_FALSE;
     mResult = GL_FALSE;
@@ -35,7 +36,7 @@
     if (mQuery == NULL)
     {
         // D3D9_REPLACE
-        if (FAILED(getDevice()->CreateQuery(D3DQUERYTYPE_OCCLUSION, &mQuery)))
+        if (FAILED(mRenderer->getDevice()->CreateQuery(D3DQUERYTYPE_OCCLUSION, &mQuery)))
         {
             return error(GL_OUT_OF_MEMORY);
         }
@@ -69,9 +70,9 @@
             // explicitly check for device loss
             // some drivers seem to return S_FALSE even if the device is lost
             // instead of D3DERR_DEVICELOST like they should
-            if (gl::getDisplay()->getRenderer()->testDeviceLost()) // D3D9_REPLACE
+            if (mRenderer->testDeviceLost())
             {
-                gl::getDisplay()->notifyDeviceLost();
+                gl::getDisplay()->notifyDeviceLost(); // D3D9_REPLACE
                 return error(GL_OUT_OF_MEMORY, 0);
             }
         }