mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-09-06 15:39:20 +02:00
Merge pull request #6981 from ameerj/nvflinger-hb-format
nvflinger: Use external surface format for framebuffer creation
This commit is contained in:
commit
55854c807d
@ -42,15 +42,14 @@ void nvdisp_disp0::OnClose(DeviceFD fd) {}
|
|||||||
void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u32 height,
|
void nvdisp_disp0::flip(u32 buffer_handle, u32 offset, u32 format, u32 width, u32 height,
|
||||||
u32 stride, NVFlinger::BufferQueue::BufferTransformFlags transform,
|
u32 stride, NVFlinger::BufferQueue::BufferTransformFlags transform,
|
||||||
const Common::Rectangle<int>& crop_rect) {
|
const Common::Rectangle<int>& crop_rect) {
|
||||||
VAddr addr = nvmap_dev->GetObjectAddress(buffer_handle);
|
const VAddr addr = nvmap_dev->GetObjectAddress(buffer_handle);
|
||||||
LOG_TRACE(Service,
|
LOG_TRACE(Service,
|
||||||
"Drawing from address {:X} offset {:08X} Width {} Height {} Stride {} Format {}",
|
"Drawing from address {:X} offset {:08X} Width {} Height {} Stride {} Format {}",
|
||||||
addr, offset, width, height, stride, format);
|
addr, offset, width, height, stride, format);
|
||||||
|
|
||||||
using PixelFormat = Tegra::FramebufferConfig::PixelFormat;
|
const auto pixel_format = static_cast<Tegra::FramebufferConfig::PixelFormat>(format);
|
||||||
const Tegra::FramebufferConfig framebuffer{
|
const Tegra::FramebufferConfig framebuffer{addr, offset, width, height,
|
||||||
addr, offset, width, height, stride, static_cast<PixelFormat>(format),
|
stride, pixel_format, transform, crop_rect};
|
||||||
transform, crop_rect};
|
|
||||||
|
|
||||||
system.GetPerfStats().EndSystemFrame();
|
system.GetPerfStats().EndSystemFrame();
|
||||||
system.GPU().SwapBuffers(&framebuffer);
|
system.GPU().SwapBuffers(&framebuffer);
|
||||||
|
@ -42,7 +42,9 @@ struct IGBPBuffer {
|
|||||||
u32_le index;
|
u32_le index;
|
||||||
INSERT_PADDING_WORDS(3);
|
INSERT_PADDING_WORDS(3);
|
||||||
u32_le gpu_buffer_id;
|
u32_le gpu_buffer_id;
|
||||||
INSERT_PADDING_WORDS(17);
|
INSERT_PADDING_WORDS(6);
|
||||||
|
u32_le external_format;
|
||||||
|
INSERT_PADDING_WORDS(10);
|
||||||
u32_le nvmap_handle;
|
u32_le nvmap_handle;
|
||||||
u32_le offset;
|
u32_le offset;
|
||||||
INSERT_PADDING_WORDS(60);
|
INSERT_PADDING_WORDS(60);
|
||||||
|
@ -298,7 +298,7 @@ void NVFlinger::Compose() {
|
|||||||
auto nvdisp = nvdrv->GetDevice<Nvidia::Devices::nvdisp_disp0>("/dev/nvdisp_disp0");
|
auto nvdisp = nvdrv->GetDevice<Nvidia::Devices::nvdisp_disp0>("/dev/nvdisp_disp0");
|
||||||
ASSERT(nvdisp);
|
ASSERT(nvdisp);
|
||||||
|
|
||||||
nvdisp->flip(igbp_buffer.gpu_buffer_id, igbp_buffer.offset, igbp_buffer.format,
|
nvdisp->flip(igbp_buffer.gpu_buffer_id, igbp_buffer.offset, igbp_buffer.external_format,
|
||||||
igbp_buffer.width, igbp_buffer.height, igbp_buffer.stride,
|
igbp_buffer.width, igbp_buffer.height, igbp_buffer.stride,
|
||||||
buffer->get().transform, buffer->get().crop_rect);
|
buffer->get().transform, buffer->get().crop_rect);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user