summaryrefslogtreecommitdiff
path: root/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp')
-rw-r--r--chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
index 0305720a4f7..4ba053e6bd6 100644
--- a/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
+++ b/chromium/third_party/angle/src/libANGLE/renderer/d3d/d3d9/Query9.cpp
@@ -36,7 +36,7 @@ gl::Error Query9::begin()
HRESULT result = mRenderer->getDevice()->CreateQuery(d3dQueryType, &mQuery);
if (FAILED(result))
{
- return gl::Error(GL_OUT_OF_MEMORY, "Internal query creation failed, result: 0x%X.", result);
+ return gl::OutOfMemory() << "Internal query creation failed, " << gl::FmtHR(result);
}
}
@@ -46,8 +46,7 @@ gl::Error Query9::begin()
ASSERT(SUCCEEDED(result));
if (FAILED(result))
{
- return gl::Error(GL_OUT_OF_MEMORY, "Failed to begin internal query, result: 0x%X.",
- result);
+ return gl::OutOfMemory() << "Failed to begin internal query, " << gl::FmtHR(result);
}
}
@@ -62,7 +61,7 @@ gl::Error Query9::end()
ASSERT(SUCCEEDED(result));
if (FAILED(result))
{
- return gl::Error(GL_OUT_OF_MEMORY, "Failed to end internal query, result: 0x%X.", result);
+ return gl::OutOfMemory() << "Failed to end internal query, " << gl::FmtHR(result);
}
mQueryFinished = false;
@@ -74,7 +73,7 @@ gl::Error Query9::end()
gl::Error Query9::queryCounter()
{
UNIMPLEMENTED();
- return gl::Error(GL_INVALID_OPERATION, "Unimplemented");
+ return gl::InternalError() << "Unimplemented";
}
template <typename T>
@@ -174,12 +173,12 @@ gl::Error Query9::testQuery()
if (d3d9::isDeviceLostError(result))
{
mRenderer->notifyDeviceLost();
- return gl::Error(GL_OUT_OF_MEMORY, "Failed to test get query result, device is lost.");
+ return gl::OutOfMemory() << "Failed to test get query result, device is lost.";
}
else if (mRenderer->testDeviceLost())
{
mRenderer->notifyDeviceLost();
- return gl::Error(GL_OUT_OF_MEMORY, "Failed to test get query result, device is lost.");
+ return gl::OutOfMemory() << "Failed to test get query result, device is lost.";
}
}