Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/prBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,25 @@
# The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
# You can convert this to a matrix build if you need cross-platform coverage.
# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
runs-on: windows-latest
# Pin to windows-2022: this image includes the Windows Driver Kit (WDK) pre-installed,
# which is required for WDK-dependent headers (d3d10umddi.h, d3d12TokenizedProgramFormat.hpp).
# windows-latest now resolves to windows-2025 which does not include the WDK.
runs-on: windows-2022

steps:
- uses: actions/checkout@v3
- uses: NuGet/setup-nuget@v1.2.0
with:
nuget-version: latest

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DUSE_PIX=OFF -DCMAKE_SYSTEM_VERSION="10.0.22621.0"

- name: Nuget Restore
run: nuget restore ${{github.workspace}}/build/D3D9on12.sln

- name: Build
# Build your program with the given configuration
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

Check warning

Code scanning / CodeQL

Workflow does not contain permissions Medium

Actions job or workflow does not limit the permissions of the GITHUB_TOKEN. Consider setting an explicit permissions block, using the following as a minimal starting point: {contents: read}
8 changes: 8 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ FetchContent_Declare(
)
FetchContent_MakeAvailable(d3d12translationlayer)

# D3D12TranslationLayer's DxbcParser doesn't link to Microsoft::DirectX-Headers,
# so d3d12TokenizedProgramFormat.hpp is not on its include path. Fix this by
# linking dxbcparser to Microsoft::DirectX-Headers which propagates the correct
# include directories.
if(TARGET dxbcparser AND TARGET Microsoft::DirectX-Headers)
target_link_libraries(dxbcparser PRIVATE Microsoft::DirectX-Headers)
endif()

target_link_libraries(d3d9on12 d3d12translationlayer_wdk)
target_link_libraries(d3d9on12 d3d9on12_shaderconv)

Expand Down
Loading