brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cogl/framebuffer: Remove alignment of struct fields

Browse Source 
They weren't all aligned anyway.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1496
This commit is contained in:
Jonas Ådahl 2020-10-12 19:56:13 +02:00 committed by Georges Basile Stavracas Neto
parent e7b923289a
commit 4edcc21a5c
1 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,43 +118,44 @@ typedef struct
struct _CoglFramebuffer struct _CoglFramebuffer
{ {
CoglObject _parent; CoglObject _parent;
CoglContext *context;
CoglFramebufferType type; CoglContext *context;
CoglFramebufferType type;
/* The user configuration before allocation... */ /* The user configuration before allocation... */
CoglFramebufferConfig config; CoglFramebufferConfig config;
int width; int width;
int height; int height;
/* Format of the pixels in the framebuffer (including the expected /* Format of the pixels in the framebuffer (including the expected
premult state) */ premult state) */
CoglPixelFormat internal_format; CoglPixelFormat internal_format;
gboolean allocated; gboolean allocated;
CoglMatrixStack *modelview_stack; CoglMatrixStack *modelview_stack;
CoglMatrixStack *projection_stack; CoglMatrixStack *projection_stack;
float viewport_x; float viewport_x;
float viewport_y; float viewport_y;
float viewport_width; float viewport_width;
float viewport_height; float viewport_height;
int viewport_age; int viewport_age;
int viewport_age_for_scissor_workaround; int viewport_age_for_scissor_workaround;
CoglClipStack *clip_stack; CoglClipStack *clip_stack;
gboolean dither_enabled; gboolean dither_enabled;
gboolean depth_writing_enabled; gboolean depth_writing_enabled;
CoglStereoMode stereo_mode; CoglStereoMode stereo_mode;
/* We journal the textured rectangles we want to submit to OpenGL so /* We journal the textured rectangles we want to submit to OpenGL so
* we have an opportunity to batch them together into less draw * we have an opportunity to batch them together into less draw
* calls. */ * calls. */
CoglJournal *journal; CoglJournal *journal;
/* The scene of a given framebuffer may depend on images in other /* The scene of a given framebuffer may depend on images in other
* framebuffers... */ * framebuffers... */
GList *deps; GList *deps;
/* As part of an optimization for reading-back single pixels from a /* As part of an optimization for reading-back single pixels from a
* framebuffer in some simple cases where the geometry is still * framebuffer in some simple cases where the geometry is still
@ -162,26 +163,26 @@ struct _CoglFramebuffer
* region cleared, its color and we need to track when something * region cleared, its color and we need to track when something
* does in fact draw to that region so it is no longer clear. * does in fact draw to that region so it is no longer clear.
*/ */
float clear_color_red; float clear_color_red;
float clear_color_green; float clear_color_green;
float clear_color_blue; float clear_color_blue;
float clear_color_alpha; float clear_color_alpha;
int clear_clip_x0; int clear_clip_x0;
int clear_clip_y0; int clear_clip_y0;
int clear_clip_x1; int clear_clip_x1;
int clear_clip_y1; int clear_clip_y1;
gboolean clear_clip_dirty; gboolean clear_clip_dirty;
/* driver specific */ /* driver specific */
gboolean dirty_bitmasks; gboolean dirty_bitmasks;
CoglFramebufferBits bits; CoglFramebufferBits bits;
int samples_per_pixel; int samples_per_pixel;
/* Whether the depth buffer was enabled for this framebuffer, /* Whether the depth buffer was enabled for this framebuffer,
* usually means it needs to be cleared before being reused next. * usually means it needs to be cleared before being reused next.
*/ */
gboolean depth_buffer_clear_needed; gboolean depth_buffer_clear_needed;
}; };
typedef enum typedef enum