Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CompositorBufferType: EventFrame should be 64bit also on 32bit #29

Merged
merged 3 commits into from
Jan 17, 2024
Merged

CompositorBufferType: EventFrame should be 64bit also on 32bit #29

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bf52a9
CompositorBufferType: EventFrame should be 64bit also on 32bit
bramoosterhuis Jan 15, 2024
e688d9b
CompositorBuffer: Add initialization
bramoosterhuis Jan 17, 2024
c5c0991
Merge branch 'main' into fix/CompositorBuffer--EventFrame-should-be-6…
bramoosterhuis Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions Source/compositorbuffer/include/compositorbuffer/CompositorBufferType.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,10 @@ namespace Compositor {
template <const uint8_t PLANES>
class CompositorBufferType : public Exchange::ICompositionBuffer, public Core::IResource {
private:
// We need to test this on a 32 bit platform. On 64 bits platforms we do need
// the data to be written into the eventfd to be 64 bits otherwise it does not
// respond!
#if defined(__SIZEOF_POINTER__) && (__SIZEOF_POINTER__ == 8)
/***
* We need a 64bit according: https://github.com/torvalds/linux/blob/v6.1/fs/eventfd.c#L275
*/
using EventFrame = uint64_t;
#else
using EventFrame = uint32_t;
#endif

// We need some shared space for data to exchange, and to create a lock..
class SharedStorage {
Expand Down Expand Up @@ -72,6 +68,13 @@ namespace Compositor {
SharedStorage& operator=(const SharedStorage&) = delete;

SharedStorage()
: _width(0)
, _height(0)
, _format(0)
, _modifier(0)
, _type(Exchange::ICompositionBuffer::TYPE_INVALID)
, _dirty()
, _copyOfDirty(false)
{
}
SharedStorage(const uint32_t width, const uint32_t height, const uint32_t format, const uint64_t modifier, const Exchange::ICompositionBuffer::DataType type)
Expand Down