We got a skybox
This commit is contained in:
@@ -15,6 +15,7 @@
|
||||
#include <destrum/Graphics/Init.h>
|
||||
|
||||
#include "destrum/Graphics/imageLoader.h"
|
||||
#include "destrum/Util/GameState.h"
|
||||
#include "spdlog/spdlog.h"
|
||||
|
||||
GfxDevice::GfxDevice(): imageCache(*this) {
|
||||
@@ -141,7 +142,7 @@ void GfxDevice::init(SDL_Window* window, const std::string& appName, bool vSync)
|
||||
// "white texture",
|
||||
// &pixel);
|
||||
// }
|
||||
|
||||
GameState::GetInstance().SetGfxDevice(this);
|
||||
}
|
||||
|
||||
void GfxDevice::recreateSwapchain(int width, int height) {
|
||||
@@ -164,6 +165,10 @@ VkCommandBuffer GfxDevice::beginFrame() {
|
||||
return cmd;
|
||||
}
|
||||
|
||||
VulkanImmediateExecutor& GfxDevice::GetImmediateExecuter() {
|
||||
return executor;
|
||||
}
|
||||
|
||||
void GfxDevice::endFrame(VkCommandBuffer cmd, const GPUImage& drawImage, const EndFrameProps& props) {
|
||||
// get swapchain image
|
||||
const auto [swapchainImage, swapchainImageIndex] = swapchain.acquireNextImage(getCurrentFrameIndex());
|
||||
@@ -426,7 +431,7 @@ GPUImage GfxDevice::createImageRaw(
|
||||
|
||||
if (createInfo.isCubemap) {
|
||||
assert(createInfo.numLayers % 6 == 0);
|
||||
assert(!createInfo.mipMap);
|
||||
// assert(!createInfo.mipMap);
|
||||
assert((createInfo.flags & VK_IMAGE_CREATE_CUBE_COMPATIBLE_BIT) != 0);
|
||||
}
|
||||
|
||||
@@ -503,16 +508,14 @@ GPUImage GfxDevice::createImageRaw(
|
||||
|
||||
void GfxDevice::uploadImageData(const GPUImage& image, void* pixelData, std::uint32_t layer) const
|
||||
{
|
||||
int numChannels = 4;
|
||||
if (image.format == VK_FORMAT_R8_UNORM) {
|
||||
// FIXME: support more types
|
||||
numChannels = 1;
|
||||
}
|
||||
const auto dataSize =
|
||||
image.extent.depth * image.extent.width * image.extent.height * numChannels;
|
||||
VkDeviceSize dataSize =
|
||||
VkDeviceSize(image.extent.depth) *
|
||||
image.extent.width *
|
||||
image.extent.height *
|
||||
BytesPerTexel(image.format);
|
||||
|
||||
const auto uploadBuffer = createBuffer(dataSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
|
||||
memcpy(uploadBuffer.info.pMappedData, pixelData, dataSize);
|
||||
auto uploadBuffer = createBuffer(dataSize, VK_BUFFER_USAGE_TRANSFER_SRC_BIT);
|
||||
memcpy(uploadBuffer.info.pMappedData, pixelData, size_t(dataSize));
|
||||
|
||||
executor.immediateSubmit([&](VkCommandBuffer cmd) {
|
||||
assert(
|
||||
|
||||
Reference in New Issue
Block a user