aboutsummaryrefslogtreecommitdiff
path: root/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp
diff options
context:
space:
mode:
authorGeoff Lang <geofflang@chromium.org>2014-07-25 13:48:02 -0400
committerGeoff Lang <geofflang@chromium.org>2014-09-08 19:08:47 +0000
commitcc79b8c6b3c713904fa6d0613018b3e2f7fd8eac (patch)
tree96ef78a1d5a16853eeff0627b5e314ad0df8c2d0 /src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp
parent2a1c15a1ab1852ab11fb8d12822c98aac11619ae (diff)
downloadangle-cc79b8c6b3c713904fa6d0613018b3e2f7fd8eac.tar.gz
Update clear calls to return Error objects instead of calling gl::error.
BUG=angle:520 Change-Id: I474a6ed29b882963f7f3425515e7d65f8f69b3e4 Reviewed-on: https://chromium-review.googlesource.com/211440 Reviewed-by: Shannon Woods <shannonwoods@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>
Diffstat (limited to 'src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp')
-rw-r--r--src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp b/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp
index 46d5e7d0..7c45105b 100644
--- a/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libGLESv2/renderer/d3d/d3d11/Renderer11.cpp
@@ -1521,10 +1521,17 @@ void Renderer11::applyUniforms(const gl::ProgramBinary &programBinary)
}
}
-void Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
+gl::Error Renderer11::clear(const gl::ClearParameters &clearParams, gl::Framebuffer *frameBuffer)
{
- mClear->clearFramebuffer(clearParams, frameBuffer);
+ gl::Error error = mClear->clearFramebuffer(clearParams, frameBuffer);
+ if (error.isError())
+ {
+ return error;
+ }
+
invalidateFramebufferSwizzles(frameBuffer);
+
+ return gl::Error(GL_NO_ERROR);
}
void Renderer11::markAllStateDirty()