From 65f5b873c8e66844feaebd801c3d531c52ee71b3 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Wed, 8 Jun 2022 11:02:07 -0700 Subject: [PATCH] Revert local changes I accidentally pushed like an idiot --- aurora/CMakeLists.txt | 2 +- aurora/lib/gfx/common.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/aurora/CMakeLists.txt b/aurora/CMakeLists.txt index 4a05a078a..40498711c 100644 --- a/aurora/CMakeLists.txt +++ b/aurora/CMakeLists.txt @@ -36,7 +36,7 @@ if (DAWN_ENABLE_D3D12) target_sources(aurora PRIVATE lib/dawn/D3D12Binding.cpp) endif () if (DAWN_ENABLE_DESKTOP_GL) - target_compile_definitions(aurora PRIVATE DAWN_ENABLE_BACKEND_OPENGL DAWN_ENABLE_BACKEND_DESKTOP_GL DAWN_ENABLE_BACKEND_OPENGLES) + target_compile_definitions(aurora PRIVATE DAWN_ENABLE_BACKEND_OPENGL DAWN_ENABLE_BACKEND_DESKTOP_GL) target_sources(aurora PRIVATE lib/dawn/OpenGLBinding.cpp) endif () if (DAWN_ENABLE_NULL) diff --git a/aurora/lib/gfx/common.cpp b/aurora/lib/gfx/common.cpp index 003ca97ea..8023a8671 100644 --- a/aurora/lib/gfx/common.cpp +++ b/aurora/lib/gfx/common.cpp @@ -313,8 +313,7 @@ static void pipeline_worker() { void initialize() { // No async pipelines for OpenGL (ES) - if (gpu::g_backendType != wgpu::BackendType::OpenGL && gpu::g_backendType != wgpu::BackendType::OpenGLES && - gpu::g_backendType != wgpu::BackendType::Vulkan) { + if (gpu::g_backendType != wgpu::BackendType::OpenGL && gpu::g_backendType != wgpu::BackendType::OpenGLES) { g_pipelineThread = std::thread(pipeline_worker); g_hasPipelineThread = true; }