Small cleanup

defold · May 14, 2024 · 6bdbba7 · 6bdbba7
1 parent a280cc9
commit 6bdbba7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/engine/graphics/src/test/test_app_graphics.cpp b/engine/graphics/src/test/test_app_graphics.cpp
@@ -135,7 +135,6 @@ struct ITest
 {
  virtual void Initialize(EngineCtx*) {};
  virtual void Execute(EngineCtx*) {};
- virtual void PostFlip(EngineCtx*) {};
 };
 
 struct EngineCtx
@@ -232,10 +231,6 @@ struct ReadPixelsTest : ITest
  dmGraphics::ReadPixels(engine->m_GraphicsContext, m_Buffer, 512 * 512 * 4);
  dmLogInfo("%d, %d, %d, %d", m_Buffer[0], m_Buffer[1], m_Buffer[2], m_Buffer[3]);
  }
-
- void PostFlip(EngineCtx* engine) override
- {
- };
 };
 
 struct SubPassTest : ITest
@@ -600,9 +595,6 @@ static UpdateResult EngineUpdate(void* _engine)
 
  dmGraphics::Flip(engine->m_GraphicsContext);
 
- // color_b += 2;
- // color_g += 1;
-
  return RESULT_OK;
 }
 

diff --git a/engine/graphics/src/vulkan/graphics_vulkan_device.cpp b/engine/graphics/src/vulkan/graphics_vulkan_device.cpp
@@ -272,14 +272,8 @@ namespace dmGraphics
  vk_command_buffer_begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
  vk_command_buffer_begin_info.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
  VkResult res = vkBeginCommandBuffer(vk_command_buffer, &vk_command_buffer_begin_info);
-
- if (res != VK_SUCCESS)
- {
- return res;
- }
-
  m_CmdBuffer = vk_command_buffer;
- return VK_SUCCESS;
+ return res;
  }
 
  VkResult OneTimeCommandBuffer::End()
@@ -292,18 +286,12 @@ namespace dmGraphics
  vk_submit_info.pCommandBuffers = &m_CmdBuffer;
 
  VkResult res = vkQueueSubmit(m_Context->m_LogicalDevice.m_GraphicsQueue, 1, &vk_submit_info, VK_NULL_HANDLE);
- if (res != VK_SUCCESS)
- {
- return res;
- }
-
  vkQueueWaitIdle(m_Context->m_LogicalDevice.m_GraphicsQueue);
-
  vkFreeCommandBuffers(m_Context->m_LogicalDevice.m_Device, m_Context->m_LogicalDevice.m_CommandPool, 1, &m_CmdBuffer);
 
  m_Context = 0;
  m_CmdBuffer = VK_NULL_HANDLE;
- return VK_SUCCESS;
+ return res;
  }
 
  VkResult DeviceBuffer::MapMemory(VkDevice vk_device, uint32_t offset, uint32_t size)