Get Ganesh Vulkan backend working again, and make it the default on windows
This commit is contained in:
parent
93733c225c
commit
6c038a7e0f
4 changed files with 8 additions and 4 deletions
|
|
@ -6,7 +6,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||||
|
|
||||||
# Options to set
|
# Options to set
|
||||||
set(availableGraphicsBackends OpenGL3.3 OpenGL2.1 OpenGLES3.0 Vulkan)
|
set(availableGraphicsBackends OpenGL3.3 OpenGL2.1 OpenGLES3.0 Vulkan)
|
||||||
|
if(WIN32)
|
||||||
|
set(GRAPHICS_BACKEND Vulkan CACHE STRING "Graphics backend to use")
|
||||||
|
else()
|
||||||
set(GRAPHICS_BACKEND OpenGL3.3 CACHE STRING "Graphics backend to use")
|
set(GRAPHICS_BACKEND OpenGL3.3 CACHE STRING "Graphics backend to use")
|
||||||
|
endif()
|
||||||
|
|
||||||
set_property(CACHE GRAPHICS_BACKEND PROPERTY STRINGS ${availableGraphicsBackends})
|
set_property(CACHE GRAPHICS_BACKEND PROPERTY STRINGS ${availableGraphicsBackends})
|
||||||
list(FIND availableGraphicsBackends ${GRAPHICS_BACKEND} graphicsBackendIndex)
|
list(FIND availableGraphicsBackends ${GRAPHICS_BACKEND} graphicsBackendIndex)
|
||||||
if(graphicsBackendIndex EQUAL -1)
|
if(graphicsBackendIndex EQUAL -1)
|
||||||
|
|
@ -134,7 +139,6 @@ set(sources "src/main.cpp"
|
||||||
|
|
||||||
if((NOT EMSCRIPTEN) AND (GRAPHICS_BACKEND STREQUAL "Vulkan"))
|
if((NOT EMSCRIPTEN) AND (GRAPHICS_BACKEND STREQUAL "Vulkan"))
|
||||||
list(APPEND sources
|
list(APPEND sources
|
||||||
"include/VkBootstrap.cpp"
|
|
||||||
"src/VulkanContext/VkTestMemoryAllocator.cpp"
|
"src/VulkanContext/VkTestMemoryAllocator.cpp"
|
||||||
"src/VulkanContext/VkTestUtils.cpp"
|
"src/VulkanContext/VkTestUtils.cpp"
|
||||||
"src/VulkanContext/WindowContext.cpp"
|
"src/VulkanContext/WindowContext.cpp"
|
||||||
|
|
|
||||||
|
|
@ -45,6 +45,7 @@ class CompressorRecipe(ConanFile):
|
||||||
"use_system_libpng": False,
|
"use_system_libpng": False,
|
||||||
"use_system_libwebp": False,
|
"use_system_libwebp": False,
|
||||||
"use_system_zlib": False,
|
"use_system_zlib": False,
|
||||||
|
"use_vulkan": True,
|
||||||
"enable_svg": True,
|
"enable_svg": True,
|
||||||
"enable_skottie": False,
|
"enable_skottie": False,
|
||||||
"enable_bentleyottmann": True # for some reason, setting this to False results in an error when creating the project
|
"enable_bentleyottmann": True # for some reason, setting this to False results in an error when creating the project
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@
|
||||||
|
|
||||||
#include <include/core/SkTypes.h>
|
#include <include/core/SkTypes.h>
|
||||||
#include <include/gpu/vk/VulkanBackendContext.h>
|
#include <include/gpu/vk/VulkanBackendContext.h>
|
||||||
#include <tools/gpu/vk/GrVulkanDefines.h>
|
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|
||||||
namespace skgpu {
|
namespace skgpu {
|
||||||
|
|
|
||||||
|
|
@ -470,7 +470,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) {
|
||||||
(PFN_vkGetInstanceProcAddr)SDL_Vulkan_GetVkGetInstanceProcAddr());
|
(PFN_vkGetInstanceProcAddr)SDL_Vulkan_GetVkGetInstanceProcAddr());
|
||||||
mS.surface = mS.vulkanWindowContext->getBackbufferSurface();
|
mS.surface = mS.vulkanWindowContext->getBackbufferSurface();
|
||||||
#elif USE_SKIA_BACKEND_GANESH
|
#elif USE_SKIA_BACKEND_GANESH
|
||||||
std::unique_ptr<const skwindow::DisplayParams> displayParams = skwindow::DisplayParamsBuilder().build();
|
std::unique_ptr<const skwindow::DisplayParams> displayParams = skwindow::DisplayParamsBuilder().detach();
|
||||||
|
|
||||||
mS.vulkanWindowContext = std::make_unique<skwindow::internal::VulkanWindowContext>(std::move(displayParams),
|
mS.vulkanWindowContext = std::make_unique<skwindow::internal::VulkanWindowContext>(std::move(displayParams),
|
||||||
[window = mS.window](VkInstance instance) {
|
[window = mS.window](VkInstance instance) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue