mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-09-25 02:38:59 +00:00
LibCore: Add a wrapper for IOSurface
Going to be used for backing store in upcoming changes.
This commit is contained in:
parent
c46bea479c
commit
e37071ae05
Notes:
sideshowbarker
2024-07-16 23:54:15 +09:00
Author: https://github.com/kalenikaliaksandr
Commit: e37071ae05
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/233
Reviewed-by: https://github.com/ADKaster
Reviewed-by: https://github.com/bugaevc
4 changed files with 170 additions and 1 deletions
|
@ -83,6 +83,10 @@ if (APPLE OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
|
||||||
list(APPEND SOURCES MachPort.cpp)
|
list(APPEND SOURCES MachPort.cpp)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (APPLE)
|
||||||
|
list(APPEND SOURCES IOSurface.cpp)
|
||||||
|
endif()
|
||||||
|
|
||||||
serenity_lib(LibCore core)
|
serenity_lib(LibCore core)
|
||||||
target_link_libraries(LibCore PRIVATE LibCrypt LibTimeZone LibURL)
|
target_link_libraries(LibCore PRIVATE LibCrypt LibTimeZone LibURL)
|
||||||
target_link_libraries(LibCore PUBLIC LibCoreMinimal)
|
target_link_libraries(LibCore PUBLIC LibCoreMinimal)
|
||||||
|
@ -91,6 +95,7 @@ if (APPLE)
|
||||||
target_link_libraries(LibCore PUBLIC "-framework CoreFoundation")
|
target_link_libraries(LibCore PUBLIC "-framework CoreFoundation")
|
||||||
target_link_libraries(LibCore PUBLIC "-framework CoreServices")
|
target_link_libraries(LibCore PUBLIC "-framework CoreServices")
|
||||||
target_link_libraries(LibCore PUBLIC "-framework Foundation")
|
target_link_libraries(LibCore PUBLIC "-framework Foundation")
|
||||||
|
target_link_libraries(LibCore PUBLIC "-framework IOSurface")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ANDROID)
|
if (ANDROID)
|
||||||
|
|
122
Userland/Libraries/LibCore/IOSurface.cpp
Normal file
122
Userland/Libraries/LibCore/IOSurface.cpp
Normal file
|
@ -0,0 +1,122 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <AK/OwnPtr.h>
|
||||||
|
#include <LibCore/IOSurface.h>
|
||||||
|
|
||||||
|
#if !defined(AK_OS_MACOS)
|
||||||
|
static_assert(false, "This file must only be used for macOS");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define FixedPoint FixedPointMacOS
|
||||||
|
#define Duration DurationMacOS
|
||||||
|
#include <IOSurface/IOSurface.h>
|
||||||
|
#undef FixedPoint
|
||||||
|
#undef Duration
|
||||||
|
|
||||||
|
namespace Core {
|
||||||
|
|
||||||
|
template<typename T>
|
||||||
|
class RefAutoRelease {
|
||||||
|
AK_MAKE_NONCOPYABLE(RefAutoRelease);
|
||||||
|
|
||||||
|
public:
|
||||||
|
RefAutoRelease(T ref)
|
||||||
|
: m_ref(ref)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
~RefAutoRelease()
|
||||||
|
{
|
||||||
|
if (m_ref)
|
||||||
|
CFRelease(m_ref);
|
||||||
|
m_ref = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
T ref() const { return m_ref; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
T m_ref { nullptr };
|
||||||
|
};
|
||||||
|
|
||||||
|
struct IOSurfaceHandle::IOSurfaceRefWrapper {
|
||||||
|
IOSurfaceRef ref;
|
||||||
|
};
|
||||||
|
|
||||||
|
IOSurfaceHandle::IOSurfaceHandle(OwnPtr<IOSurfaceRefWrapper>&& ref_wrapper)
|
||||||
|
: m_ref_wrapper(move(ref_wrapper))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
IOSurfaceHandle::IOSurfaceHandle(IOSurfaceHandle&& other) = default;
|
||||||
|
IOSurfaceHandle& IOSurfaceHandle::operator=(IOSurfaceHandle&& other) = default;
|
||||||
|
|
||||||
|
IOSurfaceHandle::~IOSurfaceHandle()
|
||||||
|
{
|
||||||
|
if (m_ref_wrapper)
|
||||||
|
CFRelease(m_ref_wrapper->ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
IOSurfaceHandle IOSurfaceHandle::create(int width, int height)
|
||||||
|
{
|
||||||
|
size_t bytes_per_element = 4;
|
||||||
|
uint32_t pixel_format = 'BGRA';
|
||||||
|
|
||||||
|
RefAutoRelease<CFNumberRef> width_number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &width);
|
||||||
|
RefAutoRelease<CFNumberRef> height_number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &height);
|
||||||
|
RefAutoRelease<CFNumberRef> bytes_per_element_number = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &bytes_per_element);
|
||||||
|
RefAutoRelease<CFNumberRef> pixel_format_number = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &pixel_format);
|
||||||
|
|
||||||
|
CFMutableDictionaryRef props = CFDictionaryCreateMutable(kCFAllocatorDefault,
|
||||||
|
0,
|
||||||
|
&kCFTypeDictionaryKeyCallBacks,
|
||||||
|
&kCFTypeDictionaryValueCallBacks);
|
||||||
|
|
||||||
|
CFDictionarySetValue(props, kIOSurfaceWidth, width_number.ref());
|
||||||
|
CFDictionarySetValue(props, kIOSurfaceHeight, height_number.ref());
|
||||||
|
CFDictionarySetValue(props, kIOSurfaceBytesPerElement, bytes_per_element_number.ref());
|
||||||
|
CFDictionarySetValue(props, kIOSurfacePixelFormat, pixel_format_number.ref());
|
||||||
|
|
||||||
|
auto* ref = IOSurfaceCreate(props);
|
||||||
|
VERIFY(ref);
|
||||||
|
return IOSurfaceHandle(make<IOSurfaceRefWrapper>(ref));
|
||||||
|
}
|
||||||
|
|
||||||
|
MachPort IOSurfaceHandle::create_mach_port() const
|
||||||
|
{
|
||||||
|
auto port = IOSurfaceCreateMachPort(m_ref_wrapper->ref);
|
||||||
|
return MachPort::adopt_right(port, MachPort::PortRight::Send);
|
||||||
|
}
|
||||||
|
|
||||||
|
IOSurfaceHandle IOSurfaceHandle::from_mach_port(MachPort const& port)
|
||||||
|
{
|
||||||
|
// NOTE: This call does not destroy the port
|
||||||
|
auto* ref = IOSurfaceLookupFromMachPort(port.port());
|
||||||
|
VERIFY(ref);
|
||||||
|
return IOSurfaceHandle(make<IOSurfaceRefWrapper>(ref));
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t IOSurfaceHandle::width() const
|
||||||
|
{
|
||||||
|
return IOSurfaceGetWidth(m_ref_wrapper->ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t IOSurfaceHandle::height() const
|
||||||
|
{
|
||||||
|
return IOSurfaceGetHeight(m_ref_wrapper->ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
size_t IOSurfaceHandle::bytes_per_element() const
|
||||||
|
{
|
||||||
|
return IOSurfaceGetBytesPerElement(m_ref_wrapper->ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
void* IOSurfaceHandle::data() const
|
||||||
|
{
|
||||||
|
return IOSurfaceGetBaseAddress(m_ref_wrapper->ref);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
42
Userland/Libraries/LibCore/IOSurface.h
Normal file
42
Userland/Libraries/LibCore/IOSurface.h
Normal file
|
@ -0,0 +1,42 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024, Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <AK/Forward.h>
|
||||||
|
#include <AK/Noncopyable.h>
|
||||||
|
#include <LibCore/MachPort.h>
|
||||||
|
|
||||||
|
namespace Core {
|
||||||
|
|
||||||
|
class IOSurfaceHandle {
|
||||||
|
AK_MAKE_NONCOPYABLE(IOSurfaceHandle);
|
||||||
|
|
||||||
|
public:
|
||||||
|
IOSurfaceHandle(IOSurfaceHandle&& other);
|
||||||
|
IOSurfaceHandle& operator=(IOSurfaceHandle&& other);
|
||||||
|
|
||||||
|
static IOSurfaceHandle create(int width, int height);
|
||||||
|
static IOSurfaceHandle from_mach_port(MachPort const& port);
|
||||||
|
|
||||||
|
MachPort create_mach_port() const;
|
||||||
|
|
||||||
|
size_t width() const;
|
||||||
|
size_t height() const;
|
||||||
|
size_t bytes_per_element() const;
|
||||||
|
void* data() const;
|
||||||
|
|
||||||
|
~IOSurfaceHandle();
|
||||||
|
|
||||||
|
private:
|
||||||
|
struct IOSurfaceRefWrapper;
|
||||||
|
|
||||||
|
IOSurfaceHandle(OwnPtr<IOSurfaceRefWrapper>&&);
|
||||||
|
|
||||||
|
OwnPtr<IOSurfaceRefWrapper> m_ref_wrapper;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
|
@ -69,7 +69,7 @@ public:
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// FIXME: mach_msg wrapper? For now just let the owner poke into the internals
|
// FIXME: mach_msg wrapper? For now just let the owner poke into the internals
|
||||||
mach_port_t port() { return m_port; }
|
mach_port_t port() const { return m_port; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MachPort(PortRight, mach_port_t);
|
MachPort(PortRight, mach_port_t);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue