summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorChad Versace <[email protected]>2017-05-26 17:28:21 -0700
committerChad Versace <[email protected]>2017-06-01 12:41:32 -0700
commit9d996e94fbbfdb3692061009f5441cf61bba36ae (patch)
tree44e17498e422c20c1b221de9b53dc60daa1cedca /src/mesa/drivers/dri
parenta23cabd8ca19b8e6f2d757e89f591143ba439678 (diff)
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: [email protected] Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/intel_fbo.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index d69b9216a20..a24ddd0d88e 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;