summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <[email protected]>2024-09-11 08:04:23 -0700
committerKhem Raj <[email protected]>2025-06-02 16:02:47 -0700
commitf94d2a539c3189b086615749cfde65ca2058e04c (patch)
treef94de93117a225cea489d14ed09bf325ddc983cf
parent242b37218c382e2bdc73347c0aff5d6dd68ce9bc (diff)
Fix narrowing conversions seen on 32bit armHEADdev
This issue is seen with clang-19 when compiling for arm32 make clang-19 happier with -Wc++11-narrowing Fixes native_skia_output_device_opengl.cpp:292:47: error: non-constant-expression cannot be narrowed from type ' ↪ uint32_t' (aka 'unsigned int') to 'EGLAttrib' (aka 'int') in initializer list [-Wc++11-narrowing] 292 | EGL_DMA_BUF_PLANE0_PITCH_EXT, nativePixmap->GetDmaBufPitch(0), Pick-to: 6.8 6.9 6.10 Change-Id: I95ba1ab0a37218b6d05324df563efba6d5c39ba2 Reviewed-by: Allan Sandfeld Jensen <[email protected]>
-rw-r--r--src/core/compositor/native_skia_output_device_opengl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/compositor/native_skia_output_device_opengl.cpp b/src/core/compositor/native_skia_output_device_opengl.cpp
index 7cfc390d8..e72052512 100644
--- a/src/core/compositor/native_skia_output_device_opengl.cpp
+++ b/src/core/compositor/native_skia_output_device_opengl.cpp
@@ -248,7 +248,7 @@ QSGTexture *NativeSkiaOutputDeviceOpenGL::texture(QQuickWindow *win, uint32_t te
EGL_LINUX_DRM_FOURCC_EXT, drmFormat,
EGL_DMA_BUF_PLANE0_FD_EXT, scopedFd.get(),
EGL_DMA_BUF_PLANE0_OFFSET_EXT, static_cast<EGLAttrib>(nativePixmap->GetDmaBufOffset(0)),
- EGL_DMA_BUF_PLANE0_PITCH_EXT, nativePixmap->GetDmaBufPitch(0),
+ EGL_DMA_BUF_PLANE0_PITCH_EXT, static_cast<EGLAttrib>(nativePixmap->GetDmaBufPitch(0)),
EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, static_cast<EGLAttrib>(modifier & 0xffffffff),
EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, static_cast<EGLAttrib>(modifier >> 32),
EGL_NONE