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

backends/native: Change uint32_t modifiers to uint64_t

Browse Source 
They were erroneously cast to uint32_t. In particular this prevented the
invalid modifier from working as it is equal to a 64-bit -1.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2322>
This commit is contained in:
Ivan Molodetskikh 2022-03-06 16:56:27 +03:00
parent a0082c3148
commit 690b8806dd
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backends/native/meta-drm-buffer-dumb.c
View File

@ -163,7 +163,7 @@ meta_drm_buffer_dumb_get_offset (MetaDrmBuffer *buffer,
return buffer_dumb->offset; return buffer_dumb->offset;
} }
static uint32_t static uint64_t
meta_drm_buffer_dumb_get_modifier (MetaDrmBuffer *buffer) meta_drm_buffer_dumb_get_modifier (MetaDrmBuffer *buffer)
{ {
return DRM_FORMAT_MOD_LINEAR; return DRM_FORMAT_MOD_LINEAR;

2
src/backends/native/meta-drm-buffer-gbm.c
View File

@ -124,7 +124,7 @@ meta_drm_buffer_gbm_get_offset (MetaDrmBuffer *buffer,
return gbm_bo_get_offset (buffer_gbm->bo, plane); return gbm_bo_get_offset (buffer_gbm->bo, plane);
} }
static uint32_t static uint64_t
meta_drm_buffer_gbm_get_modifier (MetaDrmBuffer *buffer) meta_drm_buffer_gbm_get_modifier (MetaDrmBuffer *buffer)
{ {
MetaDrmBufferGbm *buffer_gbm = META_DRM_BUFFER_GBM (buffer); MetaDrmBufferGbm *buffer_gbm = META_DRM_BUFFER_GBM (buffer);

2
src/backends/native/meta-drm-buffer-import.c
View File

@ -104,7 +104,7 @@ meta_drm_buffer_import_get_offset (MetaDrmBuffer *buffer,
return meta_drm_buffer_get_offset (importee, offset); return meta_drm_buffer_get_offset (importee, offset);
} }
static uint32_t static uint64_t
meta_drm_buffer_import_get_modifier (MetaDrmBuffer *buffer) meta_drm_buffer_import_get_modifier (MetaDrmBuffer *buffer)
{ {
MetaDrmBufferImport *buffer_import = META_DRM_BUFFER_IMPORT (buffer); MetaDrmBufferImport *buffer_import = META_DRM_BUFFER_IMPORT (buffer);

2
src/backends/native/meta-drm-buffer-private.h
View File

@ -52,7 +52,7 @@ struct _MetaDrmBufferClass
uint32_t (* get_format) (MetaDrmBuffer *buffer); uint32_t (* get_format) (MetaDrmBuffer *buffer);
int (* get_offset) (MetaDrmBuffer *buffer, int (* get_offset) (MetaDrmBuffer *buffer,
int plane); int plane);
uint32_t (* get_modifier) (MetaDrmBuffer *buffer); uint64_t (* get_modifier) (MetaDrmBuffer *buffer);
gboolean (* fill_timings) (MetaDrmBuffer *buffer, gboolean (* fill_timings) (MetaDrmBuffer *buffer,
CoglFrameInfo *info, CoglFrameInfo *info,

2
src/backends/native/meta-drm-buffer.c
View File

@ -222,7 +222,7 @@ meta_drm_buffer_get_offset (MetaDrmBuffer *buffer,
return META_DRM_BUFFER_GET_CLASS (buffer)->get_offset (buffer, plane); return META_DRM_BUFFER_GET_CLASS (buffer)->get_offset (buffer, plane);
} }
uint32_t uint64_t
meta_drm_buffer_get_modifier (MetaDrmBuffer *buffer) meta_drm_buffer_get_modifier (MetaDrmBuffer *buffer)
{ {
return META_DRM_BUFFER_GET_CLASS (buffer)->get_modifier (buffer); return META_DRM_BUFFER_GET_CLASS (buffer)->get_modifier (buffer);

2
src/backends/native/meta-drm-buffer.h
View File

@ -63,7 +63,7 @@ uint32_t meta_drm_buffer_get_format (MetaDrmBuffer *buffer);
int meta_drm_buffer_get_offset (MetaDrmBuffer *buffer, int meta_drm_buffer_get_offset (MetaDrmBuffer *buffer,
int plane); int plane);
uint32_t meta_drm_buffer_get_modifier (MetaDrmBuffer *buffer); uint64_t meta_drm_buffer_get_modifier (MetaDrmBuffer *buffer);
gboolean meta_drm_buffer_supports_fill_timings (MetaDrmBuffer *buffer); gboolean meta_drm_buffer_supports_fill_timings (MetaDrmBuffer *buffer);

2
src/backends/native/meta-renderer-native.c
View File

@ -906,7 +906,7 @@ meta_renderer_native_create_dma_buf (CoglRenderer *cogl_renderer,
uint32_t stride; uint32_t stride;
uint32_t offset; uint32_t offset;
uint32_t bpp; uint32_t bpp;
uint32_t modifier; uint64_t modifier;
uint32_t format; uint32_t format;
CoglFramebuffer *dmabuf_fb; CoglFramebuffer *dmabuf_fb;
CoglDmaBufHandle *dmabuf_handle; CoglDmaBufHandle *dmabuf_handle;