Remove VulkanState dependency
Passing VulkanState everywhere (including windowLoop) made no sense. I know that "globals are evil", but this is the best solution for now.
This commit is contained in:
1 parent
e06288320d
commit
6781c1cff1
16 files changed
+285
-272
No files matched your search
@@ -36,7 +36,7 @@ uint8_t RseGraphics::graphics_run(void)
|
||||
|
||||
|
||||
|
||||
if (0 != vulkanbase::initVulkan(vulkan_state))
|
||||
if (0 != vulkanbase::initVulkan())
|
||||
return -1;
|
||||
|
||||
// FIXME: Temporary array of vertices, for testing purposes
|
||||
@@ -48,8 +48,8 @@ uint8_t RseGraphics::graphics_run(void)
|
||||
// FIXME: Temporary array of vertices, for testing purposes
|
||||
std::vector<uint16_t> indices = {0, 1, 2, 2, 3, 0};
|
||||
|
||||
uint16_t mesh_id = rse::graphics::mesh::create_mesh(vulkan_state, vertices, indices);
|
||||
rse::graphics::mesh::create_mesh_instance(vulkan_state, mesh_id, rse::graphics::mesh::InstanceData(
|
||||
uint16_t mesh_id = rse::graphics::mesh::create_mesh(vertices, indices);
|
||||
rse::graphics::mesh::create_mesh_instance(mesh_id, rse::graphics::mesh::InstanceData(
|
||||
glm::vec3(0.0f, 0.0f, 0.0f),
|
||||
glm::vec3(0.0f, 0.0f, glm::radians(45.0f)),
|
||||
1.0f
|
||||
@@ -61,9 +61,9 @@ uint8_t RseGraphics::graphics_run(void)
|
||||
// 1.0f
|
||||
// ));
|
||||
|
||||
window::windowLoop(vulkan_state);
|
||||
window::windowLoop();
|
||||
|
||||
vulkanbase::deinitVulkan(vulkan_state);
|
||||
vulkanbase::deinitVulkan();
|
||||
|
||||
window::windowTerminate();
|
||||
|
||||
|
||||
Reference in new issue
Block a user