Mesa (master): i965/dri: Fix bad GL error in intel_create_winsys_renderbuffer()
Chad Versace
chadversary at kemper.freedesktop.org
Thu Jun 1 19:44:46 UTC 2017
Module: Mesa
Branch: master
Commit: 9d996e94fbbfdb3692061009f5441cf61bba36ae
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9d996e94fbbfdb3692061009f5441cf61bba36ae
Author: Chad Versace <chadversary at chromium.org>
Date: Fri May 26 17:28:21 2017 -0700
i965/dri: Fix bad GL error in intel_create_winsys_renderbuffer()
This function never occurs in the callchain of a GL function. It occurs
only in the callchain of eglCreate*Surface and the analogous paths for
GLX. Therefore, even if a thread does have a bound GL context,
emitting a GL error here is wrong. A misplaced GL error, when no GL
call is made, can confuse clients.
Cc: mesa-stable at lists.freedesktop.org
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/drivers/dri/i965/intel_fbo.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index d69b9216a2..a24ddd0d88 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -440,13 +440,9 @@ intel_nop_alloc_storage(struct gl_context * ctx, struct gl_renderbuffer *rb,
struct intel_renderbuffer *
intel_create_winsys_renderbuffer(mesa_format format, unsigned num_samples)
{
- GET_CURRENT_CONTEXT(ctx);
-
struct intel_renderbuffer *irb = CALLOC_STRUCT(intel_renderbuffer);
- if (!irb) {
- _mesa_error(ctx, GL_OUT_OF_MEMORY, "creating renderbuffer");
+ if (!irb)
return NULL;
- }
struct gl_renderbuffer *rb = &irb->Base.Base;
irb->layer_count = 1;
More information about the mesa-commit
mailing list