isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-04-09 03:39:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cogl/offscreen: Pass ColgOffscreenFlag when allocating

Browse Source 
So that the allocation functions don't need to peek at the cached flag
struct field.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1514>
This commit is contained in:
Jonas Ådahl 2020-10-18 22:07:43 +02:00 committed by Robert Mader
parent cac5938238
commit c7ea0b3d54
6 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cogl/cogl/cogl-driver.h
View File

@ -32,7 +32,7 @@
#define __COGL_DRIVER_H #define __COGL_DRIVER_H
#include "cogl-context.h" #include "cogl-context.h"
#include "cogl-offscreen.h" #include "cogl-offscreen-private.h"
#include "cogl-framebuffer-private.h" #include "cogl-framebuffer-private.h"
#include "cogl-attribute-private.h" #include "cogl-attribute-private.h"
#include "cogl-sampler-cache-private.h" #include "cogl-sampler-cache-private.h"
@ -74,8 +74,9 @@ struct _CoglDriverVtable
GError **error); GError **error);
gboolean gboolean
(* offscreen_allocate) (CoglOffscreen *offscreen, (* offscreen_allocate) (CoglOffscreen *offscreen,
GError **error); CoglOffscreenFlags flags,
GError **error);
void void
(* offscreen_free) (CoglOffscreen *offscreen); (* offscreen_free) (CoglOffscreen *offscreen);

4
cogl/cogl/cogl-offscreen.c
View File

@ -106,7 +106,9 @@ cogl_offscreen_allocate (CoglFramebuffer *framebuffer,
texture_format = _cogl_texture_get_format (offscreen->texture); texture_format = _cogl_texture_get_format (offscreen->texture);
_cogl_framebuffer_set_internal_format (framebuffer, texture_format); _cogl_framebuffer_set_internal_format (framebuffer, texture_format);
if (!ctx->driver_vtable->offscreen_allocate (offscreen, error)) if (!ctx->driver_vtable->offscreen_allocate (offscreen,
offscreen->create_flags,
error))
return FALSE; return FALSE;
return TRUE; return TRUE;

5
cogl/cogl/driver/gl/cogl-framebuffer-gl-private.h
View File

@ -40,8 +40,9 @@ G_DECLARE_FINAL_TYPE (CoglGlFramebuffer, cogl_gl_framebuffer,
GObject) GObject)
gboolean gboolean
_cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
GError **error); CoglOffscreenFlags flags,
GError **error);
void void
_cogl_offscreen_gl_free (CoglOffscreen *offscreen); _cogl_offscreen_gl_free (CoglOffscreen *offscreen);

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

@ -707,8 +707,9 @@ try_creating_fbo (CoglContext *ctx,
} }
gboolean gboolean
_cogl_offscreen_gl_allocate (CoglOffscreen *offscreen, _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
GError **error) CoglOffscreenFlags flags,
GError **error)
{ {
CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (offscreen); CoglFramebuffer *framebuffer = COGL_FRAMEBUFFER (offscreen);
CoglContext *ctx = cogl_framebuffer_get_context (framebuffer); CoglContext *ctx = cogl_framebuffer_get_context (framebuffer);
@ -747,7 +748,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
gl_framebuffer = ensure_gl_framebuffer (framebuffer); gl_framebuffer = ensure_gl_framebuffer (framebuffer);
gl_fbo = &gl_framebuffer->gl_fbo; gl_fbo = &gl_framebuffer->gl_fbo;
if (((offscreen->create_flags & COGL_OFFSCREEN_DISABLE_DEPTH_AND_STENCIL) && if (((flags & COGL_OFFSCREEN_DISABLE_DEPTH_AND_STENCIL) &&
try_creating_fbo (ctx, try_creating_fbo (ctx,
offscreen->texture, offscreen->texture,
offscreen->texture_level, offscreen->texture_level,
@ -823,7 +824,7 @@ _cogl_offscreen_gl_allocate (CoglOffscreen *offscreen,
cogl_framebuffer_update_samples_per_pixel (framebuffer, cogl_framebuffer_update_samples_per_pixel (framebuffer,
gl_fbo->samples_per_pixel); gl_fbo->samples_per_pixel);
if (!(offscreen->create_flags & COGL_OFFSCREEN_DISABLE_DEPTH_AND_STENCIL)) if (!(flags & COGL_OFFSCREEN_DISABLE_DEPTH_AND_STENCIL))
{ {
/* Record that the last set of flags succeeded so that we can /* Record that the last set of flags succeeded so that we can
try that set first next time */ try that set first next time */

5
cogl/cogl/driver/nop/cogl-framebuffer-nop-private.h
View File

@ -38,8 +38,9 @@
#include "cogl-context-private.h" #include "cogl-context-private.h"
gboolean gboolean
_cogl_offscreen_nop_allocate (CoglOffscreen *offscreen, _cogl_offscreen_nop_allocate (CoglOffscreen *offscreen,
GError **error); CoglOffscreenFlags flags,
GError **error);
void void
_cogl_offscreen_nop_free (CoglOffscreen *offscreen); _cogl_offscreen_nop_free (CoglOffscreen *offscreen);

5
cogl/cogl/driver/nop/cogl-framebuffer-nop.c
View File

@ -43,8 +43,9 @@ _cogl_framebuffer_nop_flush_state (CoglFramebuffer *draw_buffer,
} }
gboolean gboolean
_cogl_offscreen_nop_allocate (CoglOffscreen *offscreen, _cogl_offscreen_nop_allocate (CoglOffscreen *offscreen,
GError **error) CoglOffscreenFlags flags,
GError **error)
{ {
return TRUE; return TRUE;
} }