cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

www/wpebackend-fdo: unbreak the build on i386

Browse Source 
error: non-constant-expression cannot be narrowed from type
  'std::__1::array<unsigned int, 4>::value_type' (aka 'unsigned
  int') to 'int' in initializer list [-Wc++11-narrowing]
This commit is contained in:
Alexey Dokuchaev 2021-11-29 13:38:32 +00:00
parent 93401381ce
commit 354f1aceba
1 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
www/wpebackend-fdo/files/patch-src_egl-client-dmabuf-pool.cpp Normal file
View File

@ -0,0 +1,62 @@
--- src/egl-client-dmabuf-pool.cpp.orig 2021-10-18 22:13:13 UTC
+++ src/egl-client-dmabuf-pool.cpp
@@ -182,10 +182,10 @@ void TargetDmabufPool::frameWillRender()
uint32_t modifier_lo = bufferData.modifiers[0] & 0xFFFFFFFF;
std::array<EGLAttrib, 10> planeAttributes = {
EGL_DMA_BUF_PLANE0_FD_EXT, bufferData.fds[0],
- EGL_DMA_BUF_PLANE0_PITCH_EXT, bufferData.strides[0],
- EGL_DMA_BUF_PLANE0_OFFSET_EXT, bufferData.offsets[0],
- EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, modifier_hi,
- EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, modifier_lo,
+ EGL_DMA_BUF_PLANE0_PITCH_EXT, static_cast<int>(bufferData.strides[0]),
+ EGL_DMA_BUF_PLANE0_OFFSET_EXT, static_cast<int>(bufferData.offsets[0]),
+ EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, static_cast<int>(modifier_hi),
+ EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, static_cast<int>(modifier_lo),
};
std::copy(planeAttributes.begin(), planeAttributes.end(),
@@ -198,10 +198,10 @@ void TargetDmabufPool::frameWillRender()
uint32_t modifier_lo = bufferData.modifiers[1] & 0xFFFFFFFF;
std::array<EGLAttrib, 10> planeAttributes = {
EGL_DMA_BUF_PLANE1_FD_EXT, bufferData.fds[1],
- EGL_DMA_BUF_PLANE1_PITCH_EXT, bufferData.strides[1],
- EGL_DMA_BUF_PLANE1_OFFSET_EXT, bufferData.offsets[1],
- EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT, modifier_hi,
- EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT, modifier_lo,
+ EGL_DMA_BUF_PLANE1_PITCH_EXT, static_cast<int>(bufferData.strides[1]),
+ EGL_DMA_BUF_PLANE1_OFFSET_EXT, static_cast<int>(bufferData.offsets[1]),
+ EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT, static_cast<int>(modifier_hi),
+ EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT, static_cast<int>(modifier_lo),
};
std::copy(planeAttributes.begin(), planeAttributes.end(),
@@ -214,10 +214,10 @@ void TargetDmabufPool::frameWillRender()
uint32_t modifier_lo = bufferData.modifiers[2] & 0xFFFFFFFF;
std::array<EGLAttrib, 10> planeAttributes = {
EGL_DMA_BUF_PLANE2_FD_EXT, bufferData.fds[2],
- EGL_DMA_BUF_PLANE2_PITCH_EXT, bufferData.strides[2],
- EGL_DMA_BUF_PLANE2_OFFSET_EXT, bufferData.offsets[2],
- EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT, modifier_hi,
- EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT, modifier_lo,
+ EGL_DMA_BUF_PLANE2_PITCH_EXT, static_cast<int>(bufferData.strides[2]),
+ EGL_DMA_BUF_PLANE2_OFFSET_EXT, static_cast<int>(bufferData.offsets[2]),
+ EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT, static_cast<int>(modifier_hi),
+ EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT, static_cast<int>(modifier_lo),
};
std::copy(planeAttributes.begin(), planeAttributes.end(),
@@ -230,10 +230,10 @@ void TargetDmabufPool::frameWillRender()
uint32_t modifier_lo = bufferData.modifiers[3] & 0xFFFFFFFF;
std::array<EGLAttrib, 10> planeAttributes = {
EGL_DMA_BUF_PLANE3_FD_EXT, bufferData.fds[3],
- EGL_DMA_BUF_PLANE3_PITCH_EXT, bufferData.strides[3],
- EGL_DMA_BUF_PLANE3_OFFSET_EXT, bufferData.offsets[3],
- EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT, modifier_hi,
- EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, modifier_lo,
+ EGL_DMA_BUF_PLANE3_PITCH_EXT, static_cast<int>(bufferData.strides[3]),
+ EGL_DMA_BUF_PLANE3_OFFSET_EXT, static_cast<int>(bufferData.offsets[3]),
+ EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT, static_cast<int>(modifier_hi),
+ EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, static_cast<int>(modifier_lo),
};
std::copy(planeAttributes.begin(), planeAttributes.end(),