Use angle::Result in front-end (Part 3)
Handles the gl::Framebuffer class and its implementation.
Bug: angleproject:2491
Change-Id: I3b9c0609e9277264ccdb370596500562df3b7d15
Reviewed-on: https://chromium-review.googlesource.com/c/1280743
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/libANGLE/renderer/null/FramebufferNULL.cpp b/src/libANGLE/renderer/null/FramebufferNULL.cpp
index f6eeeaa..e88c63d 100644
--- a/src/libANGLE/renderer/null/FramebufferNULL.cpp
+++ b/src/libANGLE/renderer/null/FramebufferNULL.cpp
@@ -26,64 +26,64 @@
{
}
-gl::Error FramebufferNULL::discard(const gl::Context *context,
- size_t count,
- const GLenum *attachments)
+angle::Result FramebufferNULL::discard(const gl::Context *context,
+ size_t count,
+ const GLenum *attachments)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::invalidate(const gl::Context *context,
- size_t count,
- const GLenum *attachments)
+angle::Result FramebufferNULL::invalidate(const gl::Context *context,
+ size_t count,
+ const GLenum *attachments)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::invalidateSub(const gl::Context *context,
- size_t count,
- const GLenum *attachments,
- const gl::Rectangle &area)
+angle::Result FramebufferNULL::invalidateSub(const gl::Context *context,
+ size_t count,
+ const GLenum *attachments,
+ const gl::Rectangle &area)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::clear(const gl::Context *context, GLbitfield mask)
+angle::Result FramebufferNULL::clear(const gl::Context *context, GLbitfield mask)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::clearBufferfv(const gl::Context *context,
- GLenum buffer,
- GLint drawbuffer,
- const GLfloat *values)
+angle::Result FramebufferNULL::clearBufferfv(const gl::Context *context,
+ GLenum buffer,
+ GLint drawbuffer,
+ const GLfloat *values)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::clearBufferuiv(const gl::Context *context,
- GLenum buffer,
- GLint drawbuffer,
- const GLuint *values)
+angle::Result FramebufferNULL::clearBufferuiv(const gl::Context *context,
+ GLenum buffer,
+ GLint drawbuffer,
+ const GLuint *values)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::clearBufferiv(const gl::Context *context,
- GLenum buffer,
- GLint drawbuffer,
- const GLint *values)
+angle::Result FramebufferNULL::clearBufferiv(const gl::Context *context,
+ GLenum buffer,
+ GLint drawbuffer,
+ const GLint *values)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::clearBufferfi(const gl::Context *context,
- GLenum buffer,
- GLint drawbuffer,
- GLfloat depth,
- GLint stencil)
+angle::Result FramebufferNULL::clearBufferfi(const gl::Context *context,
+ GLenum buffer,
+ GLint drawbuffer,
+ GLfloat depth,
+ GLint stencil)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
GLenum FramebufferNULL::getImplementationColorReadFormat(const gl::Context *context) const
@@ -112,11 +112,11 @@
return format.info->getReadPixelsType(context->getClientVersion());
}
-gl::Error FramebufferNULL::readPixels(const gl::Context *context,
- const gl::Rectangle &origArea,
- GLenum format,
- GLenum type,
- void *ptrOrOffset)
+angle::Result FramebufferNULL::readPixels(const gl::Context *context,
+ const gl::Rectangle &origArea,
+ GLenum format,
+ GLenum type,
+ void *ptrOrOffset)
{
const gl::PixelPackState &packState = context->getGLState().getPackState();
gl::Buffer *packBuffer = context->getGLState().getTargetBuffer(gl::BufferBinding::PixelPack);
@@ -141,7 +141,7 @@
if (!ClipRectangle(origArea, fbRect, &area))
{
// nothing to read
- return gl::NoError();
+ return angle::Result::Continue();
}
// Compute size of unclipped rows and initial skip
@@ -171,16 +171,16 @@
pixels += rowBytes;
}
- return gl::NoError();
+ return angle::Result::Continue();
}
-gl::Error FramebufferNULL::blit(const gl::Context *context,
- const gl::Rectangle &sourceArea,
- const gl::Rectangle &destArea,
- GLbitfield mask,
- GLenum filter)
+angle::Result FramebufferNULL::blit(const gl::Context *context,
+ const gl::Rectangle &sourceArea,
+ const gl::Rectangle &destArea,
+ GLbitfield mask,
+ GLenum filter)
{
- return gl::NoError();
+ return angle::Result::Continue();
}
bool FramebufferNULL::checkStatus(const gl::Context *context) const
@@ -194,11 +194,11 @@
return angle::Result::Continue();
}
-gl::Error FramebufferNULL::getSamplePosition(const gl::Context *context,
- size_t index,
- GLfloat *xy) const
+angle::Result FramebufferNULL::getSamplePosition(const gl::Context *context,
+ size_t index,
+ GLfloat *xy) const
{
- return gl::NoError();
+ return angle::Result::Continue();
}
} // namespace rx