diff --git a/Renderer/Pipeline.cpp b/Renderer/Pipeline.cpp index 56d99bf..dacd86e 100644 --- a/Renderer/Pipeline.cpp +++ b/Renderer/Pipeline.cpp @@ -83,7 +83,7 @@ GraphicsPipeline::GraphicsPipeline(vk::Device dev, const std::vector& sh .depthClampEnable = vk::False, .polygonMode = vk::PolygonMode::eFill, .cullMode = vk::CullModeFlagBits::eBack, - .frontFace = vk::FrontFace::eClockwise, + .frontFace = vk::FrontFace::eCounterClockwise, .depthBiasEnable = vk::False, .lineWidth = 1.0, }; @@ -121,9 +121,9 @@ GraphicsPipeline::GraphicsPipeline(vk::Device dev, const std::vector& sh /* temporary viewport and scissor, since it is a dynamic state due to the existence of window resizing */ const auto viewport = vk::Viewport{ .x = 0.0, - .y = 0.0, + .y = static_cast(extent.height), .width = static_cast(extent.width), - .height = static_cast(extent.height), + .height = -static_cast(extent.height), }; const auto scissor = vk::Rect2D { diff --git a/Renderer/Renderer.cpp b/Renderer/Renderer.cpp index b3d3fd8..842e766 100644 --- a/Renderer/Renderer.cpp +++ b/Renderer/Renderer.cpp @@ -233,7 +233,7 @@ void Renderer::draw() { }; /* flip viewport */ - auto viewport = vk::Viewport{ + auto viewport = vk::Viewport{ .x = 0.0f, // .y = 0.0f, .y = static_cast(swapchain->extent.height), @@ -243,7 +243,7 @@ void Renderer::draw() { .maxDepth = 1.0f, }; - auto scissor = vk::Rect2D{ + auto scissor = vk::Rect2D { .offset = {0, 0}, .extent = swapchain->extent, }; @@ -253,6 +253,10 @@ void Renderer::draw() { command_buffer->bind(*pipeline); + command_buffer->command_buffer.setViewport(0, viewport); + command_buffer->command_buffer.setScissor(0, scissor); + + command_buffer->bind(*vertex_buffer); command_buffer->bind(pipeline->layout, pipeline->desc_set); @@ -262,9 +266,6 @@ void Renderer::draw() { pipeline->update(0, *uniform_buffer); - command_buffer->command_buffer.setViewport(0, viewport); - command_buffer->command_buffer.setScissor(0, scissor); - command_buffer->draw(9, 1, 0, 0); command_buffer->command_buffer.endRenderPass(); diff --git a/util/log.hpp b/util/log.hpp index c4b3f59..146cc0b 100644 --- a/util/log.hpp +++ b/util/log.hpp @@ -13,7 +13,7 @@ namespace Log { return static_cast(static_cast(a) | static_cast(b)); } - static const MessageLevelBit log_mask = ERROR | INFO | DEBUG; + static const MessageLevelBit log_mask = ERROR | INFO; template static void print(MessageLevelBit level, const std::string& fmt, Args... args) {