From cac59382388cc813e0dc6546d4b596b181eef877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Sun, 18 Oct 2020 22:06:13 +0200 Subject: [PATCH] cogl/gl-framebuffer: Fix allocate flag variable name It was called 'flags' which would conflict with a variable containing a CoglOffscreenFlag that will be added later. Part-of: --- cogl/cogl/driver/gl/cogl-framebuffer-gl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c index d1eda9206..3aae555e6 100644 --- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c +++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c @@ -712,7 +712,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, { CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (offscreen); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); - CoglOffscreenAllocateFlags flags; + CoglOffscreenAllocateFlags allocate_flags; CoglGlFramebuffer *gl_framebuffer; CoglGlFbo *gl_fbo; const CoglFramebufferConfig *config; @@ -754,7 +754,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, level_width, level_height, config, - flags = 0, + allocate_flags = 0, gl_fbo)) || (ctx->have_last_offscreen_allocate_flags && @@ -764,7 +764,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, level_width, level_height, config, - flags = ctx->last_offscreen_allocate_flags, + allocate_flags = ctx->last_offscreen_allocate_flags, gl_fbo)) || ( @@ -780,7 +780,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, level_width, level_height, config, - flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH_STENCIL, + allocate_flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH_STENCIL, gl_fbo)) || try_creating_fbo (ctx, @@ -789,7 +789,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, level_width, level_height, config, - flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH | + allocate_flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH | COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL, gl_fbo) || @@ -799,7 +799,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, level_width, level_height, config, - flags = COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL, + allocate_flags = COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL, gl_fbo) || try_creating_fbo (ctx, @@ -808,7 +808,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, level_width, level_height, config, - flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH, + allocate_flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH, gl_fbo) || try_creating_fbo (ctx, @@ -817,7 +817,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, level_width, level_height, config, - flags = 0, + allocate_flags = 0, gl_fbo)) { cogl_framebuffer_update_samples_per_pixel (framebuffer, @@ -827,7 +827,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, { /* Record that the last set of flags succeeded so that we can try that set first next time */ - ctx->last_offscreen_allocate_flags = flags; + ctx->last_offscreen_allocate_flags = allocate_flags; ctx->have_last_offscreen_allocate_flags = TRUE; }