cleanup: rename Graphics:Cursor => Graphics::Framebuffer
This commit is contained in:
@@ -14,7 +14,7 @@
|
||||
#include <Memory/Paging.hpp>
|
||||
#include <Memory/PageFrameAllocator.hpp>
|
||||
#include <Io/IoPort.hpp>
|
||||
#include <Graphics/Cursor.hpp>
|
||||
#include <Graphics/Framebuffer.hpp>
|
||||
|
||||
using namespace Kt;
|
||||
|
||||
@@ -266,9 +266,9 @@ namespace Drivers::Graphics::IntelGPU {
|
||||
|
||||
// If we still don't have valid dimensions, fall back to the firmware framebuffer
|
||||
if (g_fbWidth == 0 || g_fbHeight == 0 || g_fbPitch == 0) {
|
||||
g_fbWidth = ::Graphics::Cursor::GetFramebufferWidth();
|
||||
g_fbHeight = ::Graphics::Cursor::GetFramebufferHeight();
|
||||
g_fbPitch = ::Graphics::Cursor::GetFramebufferPitch();
|
||||
g_fbWidth = ::Graphics::Framebuffer::GetWidth();
|
||||
g_fbHeight = ::Graphics::Framebuffer::GetHeight();
|
||||
g_fbPitch = ::Graphics::Framebuffer::GetPitch();
|
||||
|
||||
KernelLogStream(INFO, "IntelGPU") << "Using firmware framebuffer dimensions: "
|
||||
<< base::dec << g_fbWidth << "x" << g_fbHeight
|
||||
@@ -398,7 +398,7 @@ namespace Drivers::Graphics::IntelGPU {
|
||||
// This keeps the same physical memory that the firmware set up (contiguous
|
||||
// pages, already HHDM-mapped), so both kernel and userspace access continue
|
||||
// to work via the original virtual/physical addresses. No copy is needed.
|
||||
uint32_t* fwFb = ::Graphics::Cursor::GetFramebufferBase();
|
||||
uint32_t* fwFb = ::Graphics::Framebuffer::GetBase();
|
||||
if (fwFb == nullptr) {
|
||||
KernelLogStream(ERROR, "IntelGPU") << "No firmware framebuffer available";
|
||||
return false;
|
||||
@@ -570,9 +570,9 @@ namespace Drivers::Graphics::IntelGPU {
|
||||
ProgramDisplayPlane();
|
||||
g_initialized = true;
|
||||
|
||||
uint64_t fwWidth = ::Graphics::Cursor::GetFramebufferWidth();
|
||||
uint64_t fwHeight = ::Graphics::Cursor::GetFramebufferHeight();
|
||||
uint64_t fwPitch = ::Graphics::Cursor::GetFramebufferPitch();
|
||||
uint64_t fwWidth = ::Graphics::Framebuffer::GetWidth();
|
||||
uint64_t fwHeight = ::Graphics::Framebuffer::GetHeight();
|
||||
uint64_t fwPitch = ::Graphics::Framebuffer::GetPitch();
|
||||
|
||||
if (g_fbWidth != fwWidth || g_fbHeight != fwHeight || g_fbPitch != fwPitch) {
|
||||
KernelLogStream(WARNING, "IntelGPU") << "GPU dimensions differ from firmware!";
|
||||
@@ -633,9 +633,9 @@ namespace Drivers::Graphics::IntelGPU {
|
||||
g_initialized = true;
|
||||
|
||||
// Diagnostic: compare GPU-detected values with firmware/Limine values
|
||||
uint64_t fwWidth = ::Graphics::Cursor::GetFramebufferWidth();
|
||||
uint64_t fwHeight = ::Graphics::Cursor::GetFramebufferHeight();
|
||||
uint64_t fwPitch = ::Graphics::Cursor::GetFramebufferPitch();
|
||||
uint64_t fwWidth = ::Graphics::Framebuffer::GetWidth();
|
||||
uint64_t fwHeight = ::Graphics::Framebuffer::GetHeight();
|
||||
uint64_t fwPitch = ::Graphics::Framebuffer::GetPitch();
|
||||
|
||||
if (g_fbWidth != fwWidth || g_fbHeight != fwHeight || g_fbPitch != fwPitch) {
|
||||
KernelLogStream(WARNING, "IntelGPU") << "GPU dimensions differ from firmware!";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <Drivers/Storage/Nvme.hpp>
|
||||
#include <Drivers/Storage/Gpt.hpp>
|
||||
#include <Drivers/Audio/IntelHda.hpp>
|
||||
#include <Graphics/Cursor.hpp>
|
||||
#include <Graphics/Framebuffer.hpp>
|
||||
#include <Net/Net.hpp>
|
||||
#include <Terminal/Terminal.hpp>
|
||||
|
||||
@@ -176,7 +176,7 @@ namespace Drivers {
|
||||
|
||||
void InitializeGraphics() {
|
||||
if (Graphics::IntelGPU::IsInitialized()) {
|
||||
::Graphics::Cursor::SetFramebuffer(
|
||||
::Graphics::Framebuffer::Set(
|
||||
Graphics::IntelGPU::GetFramebufferBase(),
|
||||
Graphics::IntelGPU::GetWidth(),
|
||||
Graphics::IntelGPU::GetHeight(),
|
||||
|
||||
Reference in New Issue
Block a user