From b7b8c8336b92ff802a2aae49af979beb1f89adfa Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 18 Feb 2022 09:08:48 -0500 Subject: [PATCH] Make GFXDummy compile successfully again --- engine/gfx/dummy/CMakeLists.txt | 2 +- engine/gfx/dummy/include/gfx_dummy.hpp | 25 ++------------ engine/gfx/dummy/src/gfx_dummy.cpp | 47 ++++---------------------- 3 files changed, 11 insertions(+), 63 deletions(-) diff --git a/engine/gfx/dummy/CMakeLists.txt b/engine/gfx/dummy/CMakeLists.txt index 2420c49..fbd9dd8 100755 --- a/engine/gfx/dummy/CMakeLists.txt +++ b/engine/gfx/dummy/CMakeLists.txt @@ -1,3 +1,3 @@ add_library(GFXDummy STATIC src/gfx_dummy.cpp) target_include_directories(GFXDummy PUBLIC include) -target_link_libraries(GFXDummy PUBLIC GFX) \ No newline at end of file +target_link_libraries(GFXDummy PUBLIC GFX Log) \ No newline at end of file diff --git a/engine/gfx/dummy/include/gfx_dummy.hpp b/engine/gfx/dummy/include/gfx_dummy.hpp index ec46911..048a4b4 100755 --- a/engine/gfx/dummy/include/gfx_dummy.hpp +++ b/engine/gfx/dummy/include/gfx_dummy.hpp @@ -4,27 +4,8 @@ class GFXDummy : public GFX { public: - bool initialize() override; - void initializeView(void* native_handle, uint32_t width, uint32_t height) override; + bool is_supported() override; + const char* get_name() override; - // buffer operations - GFXBuffer* createBuffer(void* data, GFXSize size, GFXBufferUsage usage) override; - void copyBuffer(GFXBuffer* buffer, void* data, GFXSize offset, GFXSize size) override; - - // texture operations - GFXTexture* createTexture(uint32_t width, uint32_t height, GFXPixelFormat format, GFXStorageMode storageMode, GFXTextureUsage usage) override; - void copyTexture(GFXTexture* texture, void* data, GFXSize size) override; - - // framebuffer operations - GFXFramebuffer* createFramebuffer(GFXFramebufferCreateInfo& info) override; - - // render pass operations - GFXRenderPass* createRenderPass(GFXRenderPassCreateInfo& info) override; - - // pipeline operations - GFXPipeline* createPipeline(GFXPipelineCreateInfo& info) override; - - void render(GFXCommandBuffer* command_buffer) override; - - const char* getName() override; + bool initialize(const GFXCreateInfo& createInfo) override; }; diff --git a/engine/gfx/dummy/src/gfx_dummy.cpp b/engine/gfx/dummy/src/gfx_dummy.cpp index 05f3b8b..8250524 100755 --- a/engine/gfx/dummy/src/gfx_dummy.cpp +++ b/engine/gfx/dummy/src/gfx_dummy.cpp @@ -1,46 +1,13 @@ #include "gfx_dummy.hpp" -bool GFXDummy::initialize() { - return true; +bool GFXDummy::is_supported() { + return true; } -void GFXDummy::initializeView(void* native_handle, uint32_t width, uint32_t height) { - +const char* GFXDummy::get_name() { + return "Dummy"; } -GFXBuffer* GFXDummy::createBuffer(void* data, GFXSize size, GFXBufferUsage usage) { - return nullptr; -} - -void GFXDummy::copyBuffer(GFXBuffer* buffer, void* data, GFXSize offset, GFXSize size) { - -} - -GFXTexture* GFXDummy::createTexture(uint32_t width, uint32_t height, GFXPixelFormat format, GFXStorageMode storageMode, GFXTextureUsage usage) { - return nullptr; -} - -void GFXDummy::copyTexture(GFXTexture* texture, void* data, GFXSize size) { - -} - - -GFXFramebuffer* GFXDummy::createFramebuffer(GFXFramebufferCreateInfo& info) { - return nullptr; -} - -GFXRenderPass* GFXDummy::createRenderPass(GFXRenderPassCreateInfo& info) { - return nullptr; -} - -GFXPipeline* GFXDummy::createPipeline(GFXPipelineCreateInfo& info) { - return nullptr; -} - -void GFXDummy::render(GFXCommandBuffer* command_buffer) { - -} - -const char* GFXDummy::getName() { - return "None"; -} +bool GFXDummy::initialize(const GFXCreateInfo& createInfo) { + return true; +} \ No newline at end of file