diff options
Diffstat (limited to 'src/libGLESv2/renderer/d3d/d3d11')
-rw-r--r-- | src/libGLESv2/renderer/d3d/d3d11/Query11.cpp | 12 | ||||
-rw-r--r-- | src/libGLESv2/renderer/d3d/d3d11/Query11.h | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/libGLESv2/renderer/d3d/d3d11/Query11.cpp b/src/libGLESv2/renderer/d3d/d3d11/Query11.cpp index 7f77c545..bc2f9419 100644 --- a/src/libGLESv2/renderer/d3d/d3d11/Query11.cpp +++ b/src/libGLESv2/renderer/d3d/d3d11/Query11.cpp @@ -30,7 +30,7 @@ static bool checkStreamOutPrimitivesWritten(ID3D11DeviceContext *context, ID3D11 return (result == S_OK); } -Query11::Query11(rx::Renderer11 *renderer, GLenum type) : QueryImpl(type) +Query11::Query11(rx::Renderer11 *renderer, GLenum type) : QueryImpl(type), mStatus(GL_FALSE), mResult(0) { mRenderer = renderer; mQuery = NULL; @@ -41,7 +41,7 @@ Query11::~Query11() SafeRelease(mQuery); } -void Query11::begin() +bool Query11::begin() { if (mQuery == NULL) { @@ -51,11 +51,12 @@ void Query11::begin() if (FAILED(mRenderer->getDevice()->CreateQuery(&queryDesc, &mQuery))) { - return gl::error(GL_OUT_OF_MEMORY); + return gl::error(GL_OUT_OF_MEMORY, false); } } mRenderer->getDeviceContext()->Begin(mQuery); + return true; } void Query11::end() @@ -148,9 +149,4 @@ GLboolean Query11::testQuery() return GL_TRUE; // prevent blocking when query is null } -bool Query11::isStarted() const -{ - return (mQuery != NULL); -} - } diff --git a/src/libGLESv2/renderer/d3d/d3d11/Query11.h b/src/libGLESv2/renderer/d3d/d3d11/Query11.h index 7a3df46d..40cfbb6d 100644 --- a/src/libGLESv2/renderer/d3d/d3d11/Query11.h +++ b/src/libGLESv2/renderer/d3d/d3d11/Query11.h @@ -21,17 +21,19 @@ class Query11 : public QueryImpl Query11(rx::Renderer11 *renderer, GLenum type); virtual ~Query11(); - virtual void begin(); + virtual bool begin(); virtual void end(); virtual GLuint getResult(); virtual GLboolean isResultAvailable(); - virtual bool isStarted() const; private: DISALLOW_COPY_AND_ASSIGN(Query11); GLboolean testQuery(); + GLuint mResult; + GLboolean mStatus; + rx::Renderer11 *mRenderer; ID3D11Query *mQuery; }; |