sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl: Remove cogl_util_ffs macro

Browse source 
Since commit 46942c24, we don't need the wrapper macro as we always
require its implementation to be available on the build system.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/629
This commit is contained in:
Niels De Graef 2019-06-17 23:30:48 +02:00
parent be72b22964
commit 79e22853ea
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cogl/cogl/cogl-pipeline-layer.c
View file

@ -173,7 +173,7 @@ _cogl_pipeline_layer_copy_differences (CoglPipelineLayer *dest,
while (differences) while (differences)
{ {
int index = _cogl_util_ffs (differences) - 1; int index = ffs (differences) - 1;
differences &= ~(1 << index); differences &= ~(1 << index);

1
cogl/cogl/cogl-util.h
View file

@ -114,7 +114,6 @@ unsigned int
_cogl_util_one_at_a_time_mix (unsigned int hash); _cogl_util_one_at_a_time_mix (unsigned int hash);
#define _cogl_util_ffs ffs
#define _cogl_util_ffsl __builtin_ffsl #define _cogl_util_ffsl __builtin_ffsl
static inline unsigned int static inline unsigned int

2
cogl/cogl/driver/gl/cogl-texture-gl.c
View file

@ -40,7 +40,7 @@
static inline int static inline int
calculate_alignment (int rowstride) calculate_alignment (int rowstride)
{ {
int alignment = 1 << (_cogl_util_ffs (rowstride) - 1); int alignment = 1 << (ffs (rowstride) - 1);
return MIN (alignment, 8); return MIN (alignment, 8);
} }

2
cogl/cogl/driver/gl/gles/cogl-texture-driver-gles.c
View file

@ -163,7 +163,7 @@ prepare_bitmap_alignment_for_upload (CoglContext *ctx,
return cogl_object_ref (src_bmp); return cogl_object_ref (src_bmp);
/* Work out the alignment of the source rowstride */ /* Work out the alignment of the source rowstride */
alignment = 1 << (_cogl_util_ffs (src_rowstride) - 1); alignment = 1 << (ffs (src_rowstride) - 1);
alignment = MIN (alignment, 8); alignment = MIN (alignment, 8);
/* If the aligned data equals the rowstride then we can upload from /* If the aligned data equals the rowstride then we can upload from