encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

d3d11: enable d3d11 by default if it is not built with chromium 

Bug: dawn:1705
Bug: dawn:1778
Change-Id: I8d84582f6f9e84676572ecb9c174d0117468888b
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/130580
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Peng Huang <penghuang@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Peng Huang 2023-05-01 16:13:00 +00:00 committed by Dawn LUCI CQ
parent 0b3f098435
commit 925b77605e
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -77,6 +77,7 @@ function (set_if_not_defined name value description)
endfunction() endfunction()
# Default values for the backend-enabling options # Default values for the backend-enabling options
set(ENABLE_D3D11 OFF)
set(ENABLE_D3D12 OFF) set(ENABLE_D3D12 OFF)
set(ENABLE_METAL OFF) set(ENABLE_METAL OFF)
set(ENABLE_OPENGLES OFF) set(ENABLE_OPENGLES OFF)
@ -86,6 +87,7 @@ set(USE_WAYLAND OFF)
set(USE_X11 OFF) set(USE_X11 OFF)
set(BUILD_SAMPLES OFF) set(BUILD_SAMPLES OFF)
if (WIN32) if (WIN32)
set(ENABLE_D3D11 ON)
set(ENABLE_D3D12 ON) set(ENABLE_D3D12 ON)
if (NOT WINDOWS_STORE) if (NOT WINDOWS_STORE)
# Enable Vulkan in win32 compilation only # Enable Vulkan in win32 compilation only

2
scripts/dawn_features.gni
View File

@ -55,7 +55,7 @@ declare_args() {
dawn_complete_static_libs = false dawn_complete_static_libs = false
# Enables the compilation of Dawn's D3D11 backend # Enables the compilation of Dawn's D3D11 backend
dawn_enable_d3d11 = false dawn_enable_d3d11 = is_win && !build_with_chromium
# Enables the compilation of Dawn's D3D12 backend # Enables the compilation of Dawn's D3D12 backend
dawn_enable_d3d12 = is_win dawn_enable_d3d12 = is_win

1
src/dawn/native/d3d11/DeviceD3D11.cpp
View File

@ -24,6 +24,7 @@
#include "dawn/native/DynamicUploader.h" #include "dawn/native/DynamicUploader.h"
#include "dawn/native/Instance.h" #include "dawn/native/Instance.h"
#include "dawn/native/d3d/D3DError.h" #include "dawn/native/d3d/D3DError.h"
#include "dawn/native/d3d/ExternalImageDXGIImpl.h"
#include "dawn/native/d3d11/AdapterD3D11.h" #include "dawn/native/d3d11/AdapterD3D11.h"
#include "dawn/native/d3d11/BackendD3D11.h" #include "dawn/native/d3d11/BackendD3D11.h"
#include "dawn/native/d3d11/BindGroupD3D11.h" #include "dawn/native/d3d11/BindGroupD3D11.h"