diff --git a/Userland/Libraries/CMakeLists.txt b/Userland/Libraries/CMakeLists.txt index 232e79014b..1700d65457 100644 --- a/Userland/Libraries/CMakeLists.txt +++ b/Userland/Libraries/CMakeLists.txt @@ -57,6 +57,7 @@ add_subdirectory(LibTLS) add_subdirectory(LibUnicode) add_subdirectory(LibUSBDB) add_subdirectory(LibVideo) +add_subdirectory(LibVirtGPU) add_subdirectory(LibVT) add_subdirectory(LibWasm) add_subdirectory(LibWeb) diff --git a/Userland/Libraries/LibGPU/CMakeLists.txt b/Userland/Libraries/LibGPU/CMakeLists.txt index cf4fdbd1f1..2a34e78497 100644 --- a/Userland/Libraries/LibGPU/CMakeLists.txt +++ b/Userland/Libraries/LibGPU/CMakeLists.txt @@ -7,3 +7,7 @@ serenity_lib(LibGPU gpu) target_link_libraries(LibGPU PRIVATE LibCore ${CMAKE_DL_LIBS}) add_dependencies(LibGPU LibSoftGPU) + +if (SERENITYOS) + add_dependencies(LibGPU LibVirtGPU) +endif() diff --git a/Userland/Libraries/LibVirtGPU/CMakeLists.txt b/Userland/Libraries/LibVirtGPU/CMakeLists.txt new file mode 100644 index 0000000000..6d709b8f51 --- /dev/null +++ b/Userland/Libraries/LibVirtGPU/CMakeLists.txt @@ -0,0 +1,9 @@ +set(SOURCES + Device.cpp + Image.cpp + Shader.cpp +) + +serenity_lib(LibVirtGPU virtgpu) +target_link_libraries(LibVirtGPU PRIVATE LibCore) +target_sources(LibVirtGPU PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../LibGPU/Image.cpp") diff --git a/Userland/Libraries/LibVirtGPU/Device.cpp b/Userland/Libraries/LibVirtGPU/Device.cpp new file mode 100644 index 0000000000..42c351f428 --- /dev/null +++ b/Userland/Libraries/LibVirtGPU/Device.cpp @@ -0,0 +1,175 @@ +/* + * Copyright (c) 2022, Stephan Unverwerth + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include +#include + +namespace VirtGPU { + +GPU::DeviceInfo Device::info() const +{ + return { + .vendor_name = "SerenityOS", + .device_name = "VirtGPU", + .num_texture_units = GPU::NUM_TEXTURE_UNITS, + .num_lights = 8, + .max_clip_planes = 6, + .max_texture_size = 4096, + .max_texture_lod_bias = 2.f, + .stencil_bits = sizeof(GPU::StencilType) * 8, + .supports_npot_textures = true, + .supports_texture_clamp_to_edge = true, + .supports_texture_env_add = true, + }; +} + +void Device::draw_primitives(GPU::PrimitiveType, FloatMatrix4x4 const&, FloatMatrix4x4 const&, Vector&) +{ + dbgln("VirtGPU::Device::draw_primitives(): unimplemented"); +} + +void Device::resize(Gfx::IntSize) +{ + dbgln("VirtGPU::Device::resize(): unimplemented"); +} + +void Device::clear_color(FloatVector4 const&) +{ + dbgln("VirtGPU::Device::clear_color(): unimplemented"); +} + +void Device::clear_depth(GPU::DepthType) +{ + dbgln("VirtGPU::Device::clear_depth(): unimplemented"); +} + +void Device::clear_stencil(GPU::StencilType) +{ + dbgln("VirtGPU::Device::clear_stencil(): unimplemented"); +} + +void Device::blit_from_color_buffer(Gfx::Bitmap&) +{ + dbgln("VirtGPU::Device::blit_from_color_buffer(): unimplemented"); +} + +void Device::blit_from_color_buffer(NonnullRefPtr, u32, Vector2, Vector2, Vector3) +{ + dbgln("VirtGPU::Device::blit_from_color_buffer(): unimplemented"); +} + +void Device::blit_from_color_buffer(void*, Vector2, GPU::ImageDataLayout const&) +{ + dbgln("VirtGPU::Device::blit_from_color_buffer(): unimplemented"); +} + +void Device::blit_from_depth_buffer(void*, Vector2, GPU::ImageDataLayout const&) +{ + dbgln("VirtGPU::Device::blit_from_depth_buffer(): unimplemented"); +} + +void Device::blit_from_depth_buffer(NonnullRefPtr, u32, Vector2, Vector2, Vector3) +{ + dbgln("VirtGPU::Device::blit_from_depth_buffer(): unimplemented"); +} + +void Device::blit_to_color_buffer_at_raster_position(void const*, GPU::ImageDataLayout const&) +{ + dbgln("VirtGPU::Device::blit_to_color_buffer_at_raster_position(): unimplemented"); +} + +void Device::blit_to_depth_buffer_at_raster_position(void const*, GPU::ImageDataLayout const&) +{ + dbgln("VirtGPU::Device::blit_to_depth_buffer_at_raster_position(): unimplemented"); +} + +void Device::set_options(GPU::RasterizerOptions const&) +{ + dbgln("VirtGPU::Device::set_options(): unimplemented"); +} + +void Device::set_light_model_params(GPU::LightModelParameters const&) +{ + dbgln("VirtGPU::Device::set_light_model_params(): unimplemented"); +} + +GPU::RasterizerOptions Device::options() const +{ + dbgln("VirtGPU::Device::options(): unimplemented"); + return {}; +} + +GPU::LightModelParameters Device::light_model() const +{ + dbgln("VirtGPU::Device::light_model(): unimplemented"); + return {}; +} + +NonnullRefPtr Device::create_image(GPU::PixelFormat const& pixel_format, u32 width, u32 height, u32 depth, u32 max_levels) +{ + dbgln("VirtGPU::Device::create_image(): unimplemented"); + return adopt_ref(*new Image(this, pixel_format, width, height, depth, max_levels)); +} + +ErrorOr> Device::create_shader(GPU::IR::Shader const&) +{ + dbgln("VirtGPU::Device::create_shader(): unimplemented"); + return adopt_ref(*new Shader(this)); +} + +void Device::set_sampler_config(unsigned, GPU::SamplerConfig const&) +{ + dbgln("VirtGPU::Device::set_sampler_config(): unimplemented"); +} + +void Device::set_light_state(unsigned, GPU::Light const&) +{ + dbgln("VirtGPU::Device::set_light_state(): unimplemented"); +} + +void Device::set_material_state(GPU::Face, GPU::Material const&) +{ + dbgln("VirtGPU::Device::set_material_state(): unimplemented"); +} + +void Device::set_stencil_configuration(GPU::Face, GPU::StencilConfiguration const&) +{ + dbgln("VirtGPU::Device::set_stencil_configuration(): unimplemented"); +} + +void Device::set_texture_unit_configuration(GPU::TextureUnitIndex, GPU::TextureUnitConfiguration const&) +{ + dbgln("VirtGPU::Device::set_texture_unit_configuration(): unimplemented"); +} + +void Device::set_clip_planes(Vector const&) +{ + dbgln("VirtGPU::Device::set_clip_planes(): unimplemented"); +} + +GPU::RasterPosition Device::raster_position() const +{ + dbgln("VirtGPU::Device::raster_position(): unimplemented"); + return {}; +} + +void Device::set_raster_position(GPU::RasterPosition const&) +{ + dbgln("VirtGPU::Device::set_raster_position(): unimplemented"); +} + +void Device::set_raster_position(FloatVector4 const&, FloatMatrix4x4 const&, FloatMatrix4x4 const&) +{ + dbgln("VirtGPU::Device::set_raster_position(): unimplemented"); +} + +void Device::bind_fragment_shader(RefPtr) +{ + dbgln("VirtGPU::Device::bind_fragment_shader(): unimplemented"); +} + +} diff --git a/Userland/Libraries/LibVirtGPU/Device.h b/Userland/Libraries/LibVirtGPU/Device.h new file mode 100644 index 0000000000..9e7fed22f6 --- /dev/null +++ b/Userland/Libraries/LibVirtGPU/Device.h @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2022, Stephan Unverwerth + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace VirtGPU { + +class Device final : public GPU::Device { +public: + virtual GPU::DeviceInfo info() const override; + + virtual void draw_primitives(GPU::PrimitiveType, FloatMatrix4x4 const& model_view_transform, FloatMatrix4x4 const& projection_transform, Vector& vertices) override; + virtual void resize(Gfx::IntSize min_size) override; + virtual void clear_color(FloatVector4 const&) override; + virtual void clear_depth(GPU::DepthType) override; + virtual void clear_stencil(GPU::StencilType) override; + virtual void blit_from_color_buffer(Gfx::Bitmap& target) override; + virtual void blit_from_color_buffer(NonnullRefPtr, u32 level, Vector2 input_size, Vector2 input_offset, Vector3 output_offset) override; + virtual void blit_from_color_buffer(void*, Vector2 offset, GPU::ImageDataLayout const&) override; + virtual void blit_from_depth_buffer(void*, Vector2 offset, GPU::ImageDataLayout const&) override; + virtual void blit_from_depth_buffer(NonnullRefPtr, u32 level, Vector2 input_size, Vector2 input_offset, Vector3 output_offset) override; + virtual void blit_to_color_buffer_at_raster_position(void const*, GPU::ImageDataLayout const&) override; + virtual void blit_to_depth_buffer_at_raster_position(void const*, GPU::ImageDataLayout const&) override; + virtual void set_options(GPU::RasterizerOptions const&) override; + virtual void set_light_model_params(GPU::LightModelParameters const&) override; + virtual GPU::RasterizerOptions options() const override; + virtual GPU::LightModelParameters light_model() const override; + + virtual NonnullRefPtr create_image(GPU::PixelFormat const&, u32 width, u32 height, u32 depth, u32 max_levels) override; + virtual ErrorOr> create_shader(GPU::IR::Shader const&) override; + + virtual void set_sampler_config(unsigned, GPU::SamplerConfig const&) override; + virtual void set_light_state(unsigned, GPU::Light const&) override; + virtual void set_material_state(GPU::Face, GPU::Material const&) override; + virtual void set_stencil_configuration(GPU::Face, GPU::StencilConfiguration const&) override; + virtual void set_texture_unit_configuration(GPU::TextureUnitIndex, GPU::TextureUnitConfiguration const&) override; + virtual void set_clip_planes(Vector const&) override; + + virtual GPU::RasterPosition raster_position() const override; + virtual void set_raster_position(GPU::RasterPosition const& raster_position) override; + virtual void set_raster_position(FloatVector4 const& position, FloatMatrix4x4 const& model_view_transform, FloatMatrix4x4 const& projection_transform) override; + + virtual void bind_fragment_shader(RefPtr) override; +}; + +} diff --git a/Userland/Libraries/LibVirtGPU/Image.cpp b/Userland/Libraries/LibVirtGPU/Image.cpp new file mode 100644 index 0000000000..f360e99a8f --- /dev/null +++ b/Userland/Libraries/LibVirtGPU/Image.cpp @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2022, Stephan Unverwerth + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +namespace VirtGPU { + +Image::Image(void const* ownership_token, GPU::PixelFormat const& pixel_format, u32 width, u32 height, u32 depth, u32 max_levels) + : GPU::Image(ownership_token, pixel_format, width, height, depth, max_levels) +{ + dbgln("VirtGPU::Image::Image(): unimplemented"); +} + +void Image::regenerate_mipmaps() +{ + dbgln("VirtGPU::Image::regenerate_mipmaps(): unimplemented"); +} + +void Image::write_texels(u32, Vector3 const&, void const*, GPU::ImageDataLayout const&) +{ + dbgln("VirtGPU::Image::write_texels(): unimplemented"); +} + +void Image::read_texels(u32, Vector3 const&, void*, GPU::ImageDataLayout const&) const +{ + dbgln("VirtGPU::Image::read_texels(): unimplemented"); +} + +void Image::copy_texels(GPU::Image const&, u32, Vector3 const&, Vector3 const&, u32, Vector3 const&) +{ + dbgln("VirtGPU::Image::copy_texels(): unimplemented"); +} + +} diff --git a/Userland/Libraries/LibVirtGPU/Image.h b/Userland/Libraries/LibVirtGPU/Image.h new file mode 100644 index 0000000000..0c4ff5dadc --- /dev/null +++ b/Userland/Libraries/LibVirtGPU/Image.h @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2022, Stephan Unverwerth + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace VirtGPU { + +class Image final : public GPU::Image { +public: + Image(void const* ownership_token, GPU::PixelFormat const&, u32 width, u32 height, u32 depth, u32 max_levels); + + virtual void regenerate_mipmaps() override; + + virtual void write_texels(u32 level, Vector3 const& output_offset, void const* input_data, GPU::ImageDataLayout const&) override; + virtual void read_texels(u32 level, Vector3 const& input_offset, void* output_data, GPU::ImageDataLayout const&) const override; + virtual void copy_texels(GPU::Image const& source, u32 source_level, Vector3 const& source_offset, Vector3 const& size, u32 destination_level, Vector3 const& destination_offset) override; +}; + +} diff --git a/Userland/Libraries/LibVirtGPU/Shader.cpp b/Userland/Libraries/LibVirtGPU/Shader.cpp new file mode 100644 index 0000000000..1ba4a95911 --- /dev/null +++ b/Userland/Libraries/LibVirtGPU/Shader.cpp @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2022, Stephan Unverwerth + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +namespace VirtGPU { + +Shader::Shader(void const* ownership_token) + : GPU::Shader(ownership_token) +{ +} + +} diff --git a/Userland/Libraries/LibVirtGPU/Shader.h b/Userland/Libraries/LibVirtGPU/Shader.h new file mode 100644 index 0000000000..08ac247dce --- /dev/null +++ b/Userland/Libraries/LibVirtGPU/Shader.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2022, Stephan Unverwerth + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include + +namespace VirtGPU { + +class Shader final : public GPU::Shader { +public: + Shader(void const* ownership_token); +}; + +}