From 2c9ac0bc6377800ac5110c781dfabea68efa79a5 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Tue, 28 Mar 2017 14:43:23 +1100 Subject: [PATCH] mesa: always return GL_OUT_OF_MEMORY or GL_NO_ERROR when KHR_no_error enabled MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/mesa/main/getstring.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/mesa/main/getstring.c b/src/mesa/main/getstring.c index 6e9051188b3..5da405d9fa4 100644 --- a/src/mesa/main/getstring.c +++ b/src/mesa/main/getstring.c @@ -304,6 +304,17 @@ _mesa_GetError( void ) GLenum e = ctx->ErrorValue; ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); + /* From Issue (3) of the KHR_no_error spec: + * + * "Should glGetError() always return NO_ERROR or have undefined + * results? + * + * RESOLVED: It should for all errors except OUT_OF_MEMORY." + */ + if (_mesa_is_no_error_enabled(ctx) && e != GL_OUT_OF_MEMORY) { + e = GL_NO_ERROR; + } + if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_enum_to_string(e)); -- 2.30.2