diff options
| author | Sebastian Keller <skeller@gnome.org> | 2023-05-03 00:30:07 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2023-05-04 12:11:26 +0000 |
| commit | 551aebce19138c471017f6197099dd063bc5dacd (patch) | |
| tree | 9cdf831d555158b5664428f2393ae60b67e13e77 | |
| parent | 5b26db8ae85bf86bdf586cc1d698ba7e59161494 (diff) | |
| download | mutter-551aebce19138c471017f6197099dd063bc5dacd.tar.gz | |
cogl: Remove struct paddings
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>
| -rw-r--r-- | cogl/cogl/cogl-depth-state.h | 11 | ||||
| -rw-r--r-- | cogl/cogl/cogl-types.h | 10 |
2 files changed, 2 insertions, 19 deletions
diff --git a/cogl/cogl/cogl-depth-state.h b/cogl/cogl/cogl-depth-state.h index 70f5e874f..339273f37 100644 --- a/cogl/cogl/cogl-depth-state.h +++ b/cogl/cogl/cogl-depth-state.h @@ -58,17 +58,6 @@ typedef struct { gboolean COGL_PRIVATE (write_enabled); float COGL_PRIVATE (range_near); 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; /** diff --git a/cogl/cogl/cogl-types.h b/cogl/cogl/cogl-types.h index 6b898dc62..a7452ade6 100644 --- a/cogl/cogl/cogl-types.h +++ b/cogl/cogl/cogl-types.h @@ -148,14 +148,8 @@ struct _CoglColor uint8_t COGL_PRIVATE (blue); 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: @@ -176,7 +170,7 @@ struct _CoglTextureVertex CoglColor color; }; -COGL_STRUCT_SIZE_ASSERT (CoglTextureVertex, 36); +COGL_STRUCT_SIZE_ASSERT (CoglTextureVertex, 24); /** * COGL_BLEND_STRING_ERROR: |