isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 17:40:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

cogl/gl-framebuffer: Rename CoglGLFramebuffer CoglGlFbo

Browse Source 
The CoglGLFramebuffer (not CoglGlFramebuffer) is a private struct for
keeping track of the framebuffer object. To avoid confusing with
CoglGlFramebuffer, rename it CoglGlFbo.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1514>
This commit is contained in:
Jonas Ådahl 2020-10-18 21:02:51 +02:00 committed by Robert Mader
parent f56b0abaef
commit 391866d415
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cogl/cogl/cogl-framebuffer-private.h
View File

@ -117,18 +117,18 @@ typedef enum
COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL = 1L<<2 COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL = 1L<<2
} CoglOffscreenAllocateFlags; } CoglOffscreenAllocateFlags;
typedef struct _CoglGLFramebuffer typedef struct _CoglGlFbo
{ {
GLuint fbo_handle; GLuint fbo_handle;
GList *renderbuffers; GList *renderbuffers;
int samples_per_pixel; int samples_per_pixel;
} CoglGLFramebuffer; } CoglGlFbo;
struct _CoglOffscreen struct _CoglOffscreen
{ {
CoglFramebuffer parent; CoglFramebuffer parent;
CoglGLFramebuffer gl_framebuffer; CoglGlFbo gl_fbo;
CoglTexture *texture; CoglTexture *texture;
int texture_level; int texture_level;

40
cogl/cogl/driver/gl/cogl-framebuffer-gl.c
View File

@ -299,7 +299,7 @@ _cogl_framebuffer_gl_bind (CoglFramebuffer *framebuffer, GLenum target)
{ {
CoglOffscreen *offscreen = COGL_OFFSCREEN (framebuffer); CoglOffscreen *offscreen = COGL_OFFSCREEN (framebuffer);
GE (ctx, glBindFramebuffer (target, GE (ctx, glBindFramebuffer (target,
offscreen->gl_framebuffer.fbo_handle)); offscreen->gl_fbo.fbo_handle));
} }
else else
{ {
@ -649,7 +649,7 @@ try_creating_fbo (CoglContext *ctx,
CoglTexture *depth_texture, CoglTexture *depth_texture,
const CoglFramebufferConfig *config, const CoglFramebufferConfig *config,
CoglOffscreenAllocateFlags flags, CoglOffscreenAllocateFlags flags,
CoglGLFramebuffer *gl_framebuffer) CoglGlFbo *gl_fbo)
{ {
GLuint tex_gl_handle; GLuint tex_gl_handle;
GLenum tex_gl_target; GLenum tex_gl_target;
@ -681,8 +681,8 @@ try_creating_fbo (CoglContext *ctx,
ctx->current_draw_buffer_changes |= COGL_FRAMEBUFFER_STATE_BIND; ctx->current_draw_buffer_changes |= COGL_FRAMEBUFFER_STATE_BIND;
/* Generate framebuffer */ /* Generate framebuffer */
ctx->glGenFramebuffers (1, &gl_framebuffer->fbo_handle); ctx->glGenFramebuffers (1, &gl_fbo->fbo_handle);
GE (ctx, glBindFramebuffer (GL_FRAMEBUFFER, gl_framebuffer->fbo_handle)); GE (ctx, glBindFramebuffer (GL_FRAMEBUFFER, gl_fbo->fbo_handle));
if (n_samples) if (n_samples)
{ {
@ -715,7 +715,7 @@ try_creating_fbo (CoglContext *ctx,
if (flags) if (flags)
{ {
gl_framebuffer->renderbuffers = gl_fbo->renderbuffers =
try_creating_renderbuffers (ctx, try_creating_renderbuffers (ctx,
texture_level_width, texture_level_width,
texture_level_height, texture_level_height,
@ -728,10 +728,10 @@ try_creating_fbo (CoglContext *ctx,
if (status != GL_FRAMEBUFFER_COMPLETE) if (status != GL_FRAMEBUFFER_COMPLETE)
{ {
GE (ctx, glDeleteFramebuffers (1, &gl_framebuffer->fbo_handle)); GE (ctx, glDeleteFramebuffers (1, &gl_fbo->fbo_handle));
delete_renderbuffers (ctx, gl_framebuffer->renderbuffers); delete_renderbuffers (ctx, gl_fbo->renderbuffers);
gl_framebuffer->renderbuffers = NULL; gl_fbo->renderbuffers = NULL;
return FALSE; return FALSE;
} }
@ -748,7 +748,7 @@ try_creating_fbo (CoglContext *ctx,
attachment, attachment,
pname, pname,
&texture_samples) ); &texture_samples) );
gl_framebuffer->samples_per_pixel = texture_samples; gl_fbo->samples_per_pixel = texture_samples;
} }
return TRUE; return TRUE;
@ -761,7 +761,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (offscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (offscreen);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
CoglOffscreenAllocateFlags flags; CoglOffscreenAllocateFlags flags;
CoglGLFramebuffer *gl_framebuffer = &offscreen->gl_framebuffer; CoglGlFbo *gl_fbo = &offscreen->gl_fbo;
const CoglFramebufferConfig *config; const CoglFramebufferConfig *config;
int level_width; int level_width;
int level_height; int level_height;
@ -800,7 +800,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
offscreen->depth_texture, offscreen->depth_texture,
config, config,
flags = 0, flags = 0,
gl_framebuffer)) || gl_fbo)) ||
(ctx->have_last_offscreen_allocate_flags && (ctx->have_last_offscreen_allocate_flags &&
try_creating_fbo (ctx, try_creating_fbo (ctx,
@ -811,7 +811,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
offscreen->depth_texture, offscreen->depth_texture,
config, config,
flags = ctx->last_offscreen_allocate_flags, flags = ctx->last_offscreen_allocate_flags,
gl_framebuffer)) || gl_fbo)) ||
( (
/* NB: WebGL introduces a DEPTH_STENCIL_ATTACHMENT and doesn't /* NB: WebGL introduces a DEPTH_STENCIL_ATTACHMENT and doesn't
@ -828,7 +828,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
offscreen->depth_texture, offscreen->depth_texture,
config, config,
flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH_STENCIL, flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH_STENCIL,
gl_framebuffer)) || gl_fbo)) ||
try_creating_fbo (ctx, try_creating_fbo (ctx,
offscreen->texture, offscreen->texture,
@ -839,7 +839,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
config, config,
flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH | flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH |
COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL, COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL,
gl_framebuffer) || gl_fbo) ||
try_creating_fbo (ctx, try_creating_fbo (ctx,
offscreen->texture, offscreen->texture,
@ -849,7 +849,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
offscreen->depth_texture, offscreen->depth_texture,
config, config,
flags = COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL, flags = COGL_OFFSCREEN_ALLOCATE_FLAG_STENCIL,
gl_framebuffer) || gl_fbo) ||
try_creating_fbo (ctx, try_creating_fbo (ctx,
offscreen->texture, offscreen->texture,
@ -859,7 +859,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
offscreen->depth_texture, offscreen->depth_texture,
config, config,
flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH, flags = COGL_OFFSCREEN_ALLOCATE_FLAG_DEPTH,
gl_framebuffer) || gl_fbo) ||
try_creating_fbo (ctx, try_creating_fbo (ctx,
offscreen->texture, offscreen->texture,
@ -869,10 +869,10 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
offscreen->depth_texture, offscreen->depth_texture,
config, config,
flags = 0, flags = 0,
gl_framebuffer)) gl_fbo))
{ {
cogl_framebuffer_update_samples_per_pixel (framebuffer, cogl_framebuffer_update_samples_per_pixel (framebuffer,
gl_framebuffer->samples_per_pixel); gl_fbo->samples_per_pixel);
if (!(offscreen->create_flags & COGL_OFFSCREEN_DISABLE_DEPTH_AND_STENCIL)) if (!(offscreen->create_flags & COGL_OFFSCREEN_DISABLE_DEPTH_AND_STENCIL))
{ {
@ -904,9 +904,9 @@ _cogl_offscreen_gl_free (CoglOffscreen *offscreen)
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (offscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (offscreen);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
delete_renderbuffers (ctx, offscreen->gl_framebuffer.renderbuffers); delete_renderbuffers (ctx, offscreen->gl_fbo.renderbuffers);
GE (ctx, glDeleteFramebuffers (1, &offscreen->gl_framebuffer.fbo_handle)); GE (ctx, glDeleteFramebuffers (1, &offscreen->gl_fbo.fbo_handle));
} }
void void