diff options
Diffstat (limited to 'src/mesa/main/clear.c')
| -rw-r--r-- | src/mesa/main/clear.c | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c index 3adbe381854..439e7dcfc55 100644 --- a/src/mesa/main/clear.c +++ b/src/mesa/main/clear.c @@ -506,11 +506,10 @@ _mesa_ClearNamedFramebufferuiv(GLuint framebuffer, GLenum buffer, * New in GL 3.0 * Clear fixed-pt or float color buffer or depth buffer (not stencil). */ -void GLAPIENTRY -_mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value) +static ALWAYS_INLINE void +clear_bufferfv(struct gl_context *ctx, GLenum buffer, GLint drawbuffer, + const GLfloat *value, bool no_error) { - GET_CURRENT_CONTEXT(ctx); - FLUSH_VERTICES(ctx, 0); FLUSH_CURRENT(ctx, 0); @@ -527,7 +526,7 @@ _mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value) * value of MAX DRAW BUFFERS minus one; or if buffer is DEPTH, * STENCIL, or DEPTH STENCIL and drawbuffer is not zero." */ - if (drawbuffer != 0) { + if (!no_error && drawbuffer != 0) { _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfv(drawbuffer=%d)", drawbuffer); return; @@ -549,7 +548,7 @@ _mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value) case GL_COLOR: { const GLbitfield mask = make_color_buffer_mask(ctx, drawbuffer); - if (mask == INVALID_MASK) { + if (!no_error && mask == INVALID_MASK) { _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferfv(drawbuffer=%d)", drawbuffer); return; @@ -569,19 +568,29 @@ _mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value) } break; default: - /* Page 498 of the PDF, section '17.4.3.1 Clearing Individual Buffers' - * of the OpenGL 4.5 spec states: - * - * "An INVALID_ENUM error is generated by ClearBufferfv and - * ClearNamedFramebufferfv if buffer is not COLOR or DEPTH." - */ - _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfv(buffer=%s)", - _mesa_enum_to_string(buffer)); + if (!no_error) { + /* Page 498 of the PDF, section '17.4.3.1 Clearing Individual Buffers' + * of the OpenGL 4.5 spec states: + * + * "An INVALID_ENUM error is generated by ClearBufferfv and + * ClearNamedFramebufferfv if buffer is not COLOR or DEPTH." + */ + _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfv(buffer=%s)", + _mesa_enum_to_string(buffer)); + } return; } } +void GLAPIENTRY +_mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value) +{ + GET_CURRENT_CONTEXT(ctx); + clear_bufferfv(ctx, buffer, drawbuffer, value, false); +} + + /** * The ClearBuffer framework is so complicated and so riddled with the * assumption that the framebuffer is bound that, for now, we will just fake |