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

cogl: Remove struct paddings

Browse Source 
Due to cogl being a private library we don't need worry about ABI
compatibility.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2986>
This commit is contained in:
Sebastian Keller 2023-05-03 00:30:07 +02:00 committed by Marge Bot
parent 5b26db8ae8
commit 551aebce19
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cogl/cogl/cogl-depth-state.h
View File

@ -58,17 +58,6 @@ typedef struct {
gboolean COGL_PRIVATE (write_enabled); gboolean COGL_PRIVATE (write_enabled);
float COGL_PRIVATE (range_near); float COGL_PRIVATE (range_near);
float COGL_PRIVATE (range_far); float COGL_PRIVATE (range_far);
uint32_t COGL_PRIVATE (padding0);
uint32_t COGL_PRIVATE (padding1);
uint32_t COGL_PRIVATE (padding2);
uint32_t COGL_PRIVATE (padding3);
uint32_t COGL_PRIVATE (padding4);
uint32_t COGL_PRIVATE (padding5);
uint32_t COGL_PRIVATE (padding6);
uint32_t COGL_PRIVATE (padding7);
uint32_t COGL_PRIVATE (padding8);
uint32_t COGL_PRIVATE (padding9);
} CoglDepthState; } CoglDepthState;
/** /**

10
cogl/cogl/cogl-types.h
View File

@ -148,14 +148,8 @@ struct _CoglColor
uint8_t COGL_PRIVATE (blue); uint8_t COGL_PRIVATE (blue);
uint8_t COGL_PRIVATE (alpha); uint8_t COGL_PRIVATE (alpha);
/* padding in case we want to change to floats at
* some point */
uint32_t COGL_PRIVATE (padding0);
uint32_t COGL_PRIVATE (padding1);
uint32_t COGL_PRIVATE (padding2);
}; };
COGL_STRUCT_SIZE_ASSERT (CoglColor, 16); COGL_STRUCT_SIZE_ASSERT (CoglColor, 4);
/** /**
* CoglTextureVertex: * CoglTextureVertex:
@ -176,7 +170,7 @@ struct _CoglTextureVertex
CoglColor color; CoglColor color;
}; };
COGL_STRUCT_SIZE_ASSERT (CoglTextureVertex, 36); COGL_STRUCT_SIZE_ASSERT (CoglTextureVertex, 24);
/** /**
* COGL_BLEND_STRING_ERROR: * COGL_BLEND_STRING_ERROR: