AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert local changes I accidentally pushed like an idiot

This commit is contained in:
Phillip Stephens 2022-06-08 11:02:07 -07:00
parent 46a93166ef
commit 65f5b873c8
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aurora/CMakeLists.txt
View File

@ -36,7 +36,7 @@ if (DAWN_ENABLE_D3D12)
target_sources(aurora PRIVATE lib/dawn/D3D12Binding.cpp) target_sources(aurora PRIVATE lib/dawn/D3D12Binding.cpp)
endif () endif ()
if (DAWN_ENABLE_DESKTOP_GL) 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) target_sources(aurora PRIVATE lib/dawn/OpenGLBinding.cpp)
endif () endif ()
if (DAWN_ENABLE_NULL) if (DAWN_ENABLE_NULL)

3
aurora/lib/gfx/common.cpp
View File

@ -313,8 +313,7 @@ static void pipeline_worker() {
void initialize() { void initialize() {
// No async pipelines for OpenGL (ES) // No async pipelines for OpenGL (ES)
if (gpu::g_backendType != wgpu::BackendType::OpenGL && gpu::g_backendType != wgpu::BackendType::OpenGLES && if (gpu::g_backendType != wgpu::BackendType::OpenGL && gpu::g_backendType != wgpu::BackendType::OpenGLES) {
gpu::g_backendType != wgpu::BackendType::Vulkan) {
g_pipelineThread = std::thread(pipeline_worker); g_pipelineThread = std::thread(pipeline_worker);
g_hasPipelineThread = true; g_hasPipelineThread = true;
} }