diff --git a/Userland/Libraries/LibGL/Tex/Texture2D.cpp b/Userland/Libraries/LibGL/Tex/Texture2D.cpp index 662a938bf1..061cbe9090 100644 --- a/Userland/Libraries/LibGL/Tex/Texture2D.cpp +++ b/Userland/Libraries/LibGL/Tex/Texture2D.cpp @@ -60,7 +60,7 @@ void Texture2D::replace_sub_texture_data(GLuint lod, GLint xoffset, GLint yoffse int const physical_width = pixels_per_row > 0 ? pixels_per_row : width; size_t const physical_width_bytes = physical_width * pixel_size_bytes; - SoftGPU::ImageDataLayout layout; + GPU::ImageDataLayout layout; layout.column_stride = pixel_size_bytes; layout.row_stride = physical_width_bytes + (byte_alignment - physical_width_bytes % byte_alignment) % byte_alignment; layout.depth_stride = 0; diff --git a/Userland/Libraries/LibSoftGPU/ImageDataLayout.h b/Userland/Libraries/LibGPU/ImageDataLayout.h similarity index 93% rename from Userland/Libraries/LibSoftGPU/ImageDataLayout.h rename to Userland/Libraries/LibGPU/ImageDataLayout.h index 30e65ed7cc..60e135ee48 100644 --- a/Userland/Libraries/LibSoftGPU/ImageDataLayout.h +++ b/Userland/Libraries/LibGPU/ImageDataLayout.h @@ -8,7 +8,7 @@ #include -namespace SoftGPU { +namespace GPU { struct ImageDataLayout final { GPU::ImageFormat format; diff --git a/Userland/Libraries/LibSoftGPU/Image.cpp b/Userland/Libraries/LibSoftGPU/Image.cpp index f4d2e9ebb4..f60d9890b8 100644 --- a/Userland/Libraries/LibSoftGPU/Image.cpp +++ b/Userland/Libraries/LibSoftGPU/Image.cpp @@ -39,7 +39,7 @@ Image::Image(unsigned width, unsigned height, unsigned depth, unsigned max_level m_num_levels = level + 1; } -void Image::write_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void const* data, ImageDataLayout const& layout) +void Image::write_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void const* data, GPU::ImageDataLayout const& layout) { VERIFY(layer < num_layers()); VERIFY(level < num_levels()); @@ -58,7 +58,7 @@ void Image::write_texels(unsigned layer, unsigned level, Vector3 const } } -void Image::read_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void* data, ImageDataLayout const& layout) const +void Image::read_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void* data, GPU::ImageDataLayout const& layout) const { VERIFY(layer < num_layers()); VERIFY(level < num_levels()); diff --git a/Userland/Libraries/LibSoftGPU/Image.h b/Userland/Libraries/LibSoftGPU/Image.h index 23f53f6a0d..3d4a2a1564 100644 --- a/Userland/Libraries/LibSoftGPU/Image.h +++ b/Userland/Libraries/LibSoftGPU/Image.h @@ -11,12 +11,12 @@ #include #include #include +#include #include #include #include #include #include -#include namespace SoftGPU { @@ -156,8 +156,8 @@ public: pack_color(color, texel_pointer(layer, level, x, y, z), GPU::ImageFormat::BGRA8888); } - void write_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void const* data, ImageDataLayout const& layout); - void read_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void* data, ImageDataLayout const& layout) const; + void write_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void const* data, GPU::ImageDataLayout const& layout); + void read_texels(unsigned layer, unsigned level, Vector3 const& offset, Vector3 const& size, void* data, GPU::ImageDataLayout const& layout) const; void copy_texels(Image const& source, unsigned source_layer, unsigned source_level, Vector3 const& source_offset, Vector3 const& size, unsigned destination_layer, unsigned destination_level, Vector3 const& destination_offset); private: