Bananymous/banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel: Make internal framebuffer bpp constexpr defined in libc

Browse Source
This commit is contained in:
Bananymous
2023-11-29 20:07:33 +02:00
parent 7090388c70
commit 327b330338
4 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
userspace/image/Image.cpp
View File

@@ -103,14 +103,9 @@ bool Image::render_to_framebuffer()
return false;
}
if (fb_info.bpp != 24 && fb_info.bpp != 32)
{
fprintf(stderr, "unsupported framebuffer bpp\n");
close(fd);
return false;
}
ASSERT(BANAN_FB_BPP == 24 || BANAN_FB_BPP == 32);
size_t mmap_size = fb_info.height * fb_info.width * fb_info.bpp / 8;
size_t mmap_size = fb_info.height * fb_info.width * BANAN_FB_BPP / 8;
void* mmap_addr = mmap(nullptr, mmap_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (mmap_addr == MAP_FAILED)
@@ -126,11 +121,11 @@ bool Image::render_to_framebuffer()
{
for (uint64_t x = 0; x < BAN::Math::min<uint64_t>(width(), fb_info.width); x++)
{
u8_fb[(y * fb_info.width + x) * fb_info.bpp / 8 + 0] = m_bitmap[y * width() + x].r;
u8_fb[(y * fb_info.width + x) * fb_info.bpp / 8 + 1] = m_bitmap[y * width() + x].g;
u8_fb[(y * fb_info.width + x) * fb_info.bpp / 8 + 2] = m_bitmap[y * width() + x].b;
if (fb_info.bpp == 32)
u8_fb[(y * fb_info.width + x) * fb_info.bpp / 8 + 3] = m_bitmap[y * width() + x].a;
u8_fb[(y * fb_info.width + x) * BANAN_FB_BPP / 8 + 0] = m_bitmap[y * width() + x].r;
u8_fb[(y * fb_info.width + x) * BANAN_FB_BPP / 8 + 1] = m_bitmap[y * width() + x].g;
u8_fb[(y * fb_info.width + x) * BANAN_FB_BPP / 8 + 2] = m_bitmap[y * width() + x].b;
if constexpr(BANAN_FB_BPP == 32)
u8_fb[(y * fb_info.width + x) * BANAN_FB_BPP / 8 + 3] = m_bitmap[y * width() + x].a;
}
}

2
userspace/test-framebuffer/main.cpp
View File

@@ -19,7 +19,7 @@ int main()
return 1;
}
size_t fb_size = fb_info.width * fb_info.height * fb_info.bpp / 8;
size_t fb_size = fb_info.width * fb_info.height * BANAN_FB_BPP / 8;
void* addr = mmap(nullptr, fb_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (addr == MAP_FAILED)