LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 00:20:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: improve error handling when setMode fails

Browse Source
This commit is contained in:
Sasha Szpakowski
2026-07-18 10:55:16 -03:00
parent 81eb4dbcaf
commit 57e8330a64
5 changed files with 112 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/vulkan/Buffer.cpp
+3
View File
@@ -97,6 +97,9 @@ Buffer::Buffer(love::graphics::Graphics *gfx, const Settings &settings, const st
bool Buffer::loadVolatile()
{
if (buffer != VK_NULL_HANDLE)
return true;
allocator = vgfx->getVmaAllocator();
VkBufferCreateInfo bufferInfo{};
src/modules/graphics/vulkan/Graphics.cpp
+100 -81
View File
@@ -684,110 +684,120 @@ void Graphics::backbufferChanged(const BackbufferSettings &settings)
bool Graphics::setMode(void *context, const BackbufferSettings &settings)
{
// Must be called before the swapchain is created.
backbufferChanged(settings);
cleanUpFunctions.clear();
cleanUpFunctions.resize(MAX_FRAMES_IN_FLIGHT);
readbackCallbacks.clear();
readbackCallbacks.resize(MAX_FRAMES_IN_FLIGHT);
bool createBaseObjects = physicalDevice == VK_NULL_HANDLE;
createSurface();
if (createBaseObjects)
try
{
pickPhysicalDevice();
createLogicalDevice();
createPipelineCache();
initVMA();
initCapabilities();
}
// Must be called before the swapchain is created.
backbufferChanged(settings);
msaaSamples = getMsaaCount(settings.msaa);
cleanUpFunctions.clear();
cleanUpFunctions.resize(MAX_FRAMES_IN_FLIGHT);
createSwapChain();
createImageViews();
createColorResources();
createDepthResources();
transitionColorDepthLayouts = true;
readbackCallbacks.clear();
readbackCallbacks.resize(MAX_FRAMES_IN_FLIGHT);
if (createBaseObjects)
{
createCommandPool();
createCommandBuffers();
createSyncObjects();
}
createSurface();
if (localUniformBuffer == nullptr)
localUniformBuffer.set(new StreamBuffer(this, BUFFERUSAGE_UNIFORM, 1024 * 512 * 1), Acquire::NORETAIN);
beginFrame();
if (createBaseObjects)
{
if (batchedDrawState.vb[0] == nullptr)
if (createBaseObjects)
{
// Initial sizes that should be good enough for most cases. It will
// resize to fit if needed, later.
batchedDrawState.vb[0] = new StreamBuffer(this, BUFFERUSAGE_VERTEX, 1024 * 1024 * 1);
batchedDrawState.vb[1] = new StreamBuffer(this, BUFFERUSAGE_VERTEX, 256 * 1024 * 1);
batchedDrawState.indexBuffer = new StreamBuffer(this, BUFFERUSAGE_INDEX, sizeof(uint16) * LOVE_UINT16_MAX);
pickPhysicalDevice();
createLogicalDevice();
createPipelineCache();
initVMA();
initCapabilities();
}
if (defaultVertexBuffer == nullptr)
msaaSamples = getMsaaCount(settings.msaa);
createSwapChain();
createImageViews();
createColorResources();
createDepthResources();
transitionColorDepthLayouts = true;
if (createBaseObjects)
{
struct DefaultData
createCommandPool();
createCommandBuffers();
createSyncObjects();
}
if (localUniformBuffer == nullptr)
localUniformBuffer.set(new StreamBuffer(this, BUFFERUSAGE_UNIFORM, 1024 * 512 * 1), Acquire::NORETAIN);
beginFrame();
if (createBaseObjects)
{
if (batchedDrawState.vb[0] == nullptr)
{
float floats[4];
int ints[4];
float color[4];
} data;
// Initial sizes that should be good enough for most cases. It will
// resize to fit if needed, later.
batchedDrawState.vb[0] = new StreamBuffer(this, BUFFERUSAGE_VERTEX, 1024 * 1024 * 1);
batchedDrawState.vb[1] = new StreamBuffer(this, BUFFERUSAGE_VERTEX, 256 * 1024 * 1);
batchedDrawState.indexBuffer = new StreamBuffer(this, BUFFERUSAGE_INDEX, sizeof(uint16) * LOVE_UINT16_MAX);
}
data.floats[0] = 0.0f;
data.floats[1] = 0.0f;
data.floats[2] = 0.0f;
data.floats[3] = 1.0f;
if (defaultVertexBuffer == nullptr)
{
struct DefaultData
{
float floats[4];
int ints[4];
float color[4];
} data;
data.ints[0] = 0;
data.ints[1] = 0;
data.ints[2] = 0;
data.ints[3] = 1;
data.floats[0] = 0.0f;
data.floats[1] = 0.0f;
data.floats[2] = 0.0f;
data.floats[3] = 1.0f;
data.color[0] = 1.0f;
data.color[1] = 1.0f;
data.color[2] = 1.0f;
data.color[3] = 1.0f;
data.ints[0] = 0;
data.ints[1] = 0;
data.ints[2] = 0;
data.ints[3] = 1;
std::vector<Buffer::DataDeclaration> format = {
Buffer::DataDeclaration("Floats", DATAFORMAT_FLOAT_VEC4),
Buffer::DataDeclaration("Ints", DATAFORMAT_INT32_VEC4),
Buffer::DataDeclaration("Color", DATAFORMAT_FLOAT_VEC4)
};
data.color[0] = 1.0f;
data.color[1] = 1.0f;
data.color[2] = 1.0f;
data.color[3] = 1.0f;
Buffer::Settings settings(BUFFERUSAGEFLAG_VERTEX, BUFFERDATAUSAGE_STATIC);
defaultVertexBuffer.set(newBuffer(settings, format, &data, sizeof(DefaultData), 1), Acquire::NORETAIN);
std::vector<Buffer::DataDeclaration> format = {
Buffer::DataDeclaration("Floats", DATAFORMAT_FLOAT_VEC4),
Buffer::DataDeclaration("Ints", DATAFORMAT_INT32_VEC4),
Buffer::DataDeclaration("Color", DATAFORMAT_FLOAT_VEC4)
};
VkBuffer buffer = (VkBuffer)defaultVertexBuffer->getHandle();
VkDeviceSize offset = 0;
vkCmdBindVertexBuffers(commandBuffers.at(currentFrame), DEFAULT_VERTEX_BUFFER_BINDING, 1, &buffer, &offset);
Buffer::Settings settings(BUFFERUSAGEFLAG_VERTEX, BUFFERDATAUSAGE_STATIC);
defaultVertexBuffer.set(newBuffer(settings, format, &data, sizeof(DefaultData), 1), Acquire::NORETAIN);
VkBuffer buffer = (VkBuffer)defaultVertexBuffer->getHandle();
VkDeviceSize offset = 0;
vkCmdBindVertexBuffers(commandBuffers.at(currentFrame), DEFAULT_VERTEX_BUFFER_BINDING, 1, &buffer, &offset);
}
createDefaultShaders();
Shader::current = Shader::standardShaders[Shader::StandardShader::STANDARD_DEFAULT];
createQuadIndexBuffer();
createFanIndexBuffer();
currentFrame = 0;
}
createDefaultShaders();
Shader::current = Shader::standardShaders[Shader::StandardShader::STANDARD_DEFAULT];
createQuadIndexBuffer();
createFanIndexBuffer();
Volatile::loadAll();
created = true;
currentFrame = 0;
restoreState(states.back());
}
catch (std::exception &)
{
unSetMode();
throw;
}
restoreState(states.back());
Vulkan::resetShaderSwitches();
created = true;
drawCalls = 0;
drawCallsBatched = 0;
@@ -845,10 +855,13 @@ void Graphics::unSetMode()
if (created)
submitGpuCommands(SUBMIT_NOPRESENT);
Volatile::unloadAll();
created = false;
cleanupSwapChain(true);
cleanupSurface();
cleanup();
}
void Graphics::setActive(bool enable)
@@ -3495,7 +3508,11 @@ void Graphics::cleanup()
cleanUpFn();
cleanUpFunctions.clear();
vmaDestroyAllocator(vmaAllocator);
if (vmaAllocator != VK_NULL_HANDLE)
{
vmaDestroyAllocator(vmaAllocator);
vmaAllocator = VK_NULL_HANDLE;
}
for (const auto &s : renderFinishedSemaphores)
vkDestroySemaphore(device, s, nullptr);
@@ -3542,6 +3559,8 @@ void Graphics::cleanup()
vkDestroyDevice(device, nullptr);
device = VK_NULL_HANDLE;
}
physicalDevice = VK_NULL_HANDLE;
}
void Graphics::cleanupSwapChain(bool destroySwapChainObject)
src/modules/graphics/vulkan/Shader.cpp
+3
View File
@@ -300,6 +300,9 @@ Shader::Shader(StrongRef<love::graphics::ShaderStage> stages[], const CompileOpt
bool Shader::loadVolatile()
{
if (!shaderModules.empty())
return true;
device = vgfx->getDevice();
computePipeline = VK_NULL_HANDLE;
src/modules/graphics/vulkan/StreamBuffer.cpp
+3
View File
@@ -50,6 +50,9 @@ StreamBuffer::StreamBuffer(graphics::Graphics *gfx, BufferUsage mode, size_t siz
bool StreamBuffer::loadVolatile()
{
if (buffer != VK_NULL_HANDLE)
return true;
allocator = vgfx->getVmaAllocator();
VkBufferCreateInfo bufferInfo{};
src/modules/graphics/vulkan/Texture.cpp
+3
View File
@@ -60,6 +60,9 @@ Texture::Texture(love::graphics::Graphics *gfx, love::graphics::Texture *base, c
bool Texture::loadVolatile()
{
if (imageData.image != VK_NULL_HANDLE || msaaImageData.image != VK_NULL_HANDLE)
return true;
allocator = vgfx->getVmaAllocator();
device = vgfx->getDevice();