a_dinosaur/NeHe-SDL_GPU
1
0
Fork 0
mirror of https://github.com/ScrelliCopter/NeHe-SDL_GPU.git synced 2025-06-19 21:49:17 +10:00
Code Issues Packages Projects Releases Wiki Activity

c: Disable incomplete D3D12 support

Browse Source
This commit is contained in:
a dinosaur
2025-06-16 03:06:58 +10:00
parent adcca4f724
commit ebc826792c
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/modules/AddLesson.cmake
View File

@@ -37,13 +37,13 @@ function (add_lesson target)
target_sources(${target} PRIVATE "${path}") target_sources(${target} PRIVATE "${path}")
unset(path) unset(path)
else() else()
if (CMAKE_SYSTEM_NAME STREQUAL "Windows") #if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
# Copy D3D12 (DXIL) shaders into target shaders folder # # Copy D3D12 (DXIL) shaders into target shaders folder
add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different # add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
"${CMAKE_SOURCE_DIR}/data/shaders/${shader}.vtx.dxb" # "${CMAKE_SOURCE_DIR}/data/shaders/${shader}.vtx.dxb"
"${CMAKE_SOURCE_DIR}/data/shaders/${shader}.pxl.dxb" # "${CMAKE_SOURCE_DIR}/data/shaders/${shader}.pxl.dxb"
"$<TARGET_FILE_DIR:${target}>/Data/Shaders") # "$<TARGET_FILE_DIR:${target}>/Data/Shaders")
endif() #endif()
# Copy Vulkan (SPIR-V) shaders into target shaders folder # Copy Vulkan (SPIR-V) shaders into target shaders folder
add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
"${CMAKE_SOURCE_DIR}/data/shaders/${shader}.vtx.spv" "${CMAKE_SOURCE_DIR}/data/shaders/${shader}.vtx.spv"

3
src/c/nehe.c
View File

@@ -32,8 +32,9 @@ bool NeHe_InitGPU(NeHeContext* ctx, const char* title, int width, int height)
// Open GPU device // Open GPU device
const SDL_GPUShaderFormat formats = const SDL_GPUShaderFormat formats =
// FIXME: Re-enable D3D12 later when lesson9 works properly
SDL_GPU_SHADERFORMAT_METALLIB | SDL_GPU_SHADERFORMAT_MSL | SDL_GPU_SHADERFORMAT_METALLIB | SDL_GPU_SHADERFORMAT_MSL |
SDL_GPU_SHADERFORMAT_SPIRV | SDL_GPU_SHADERFORMAT_DXIL; SDL_GPU_SHADERFORMAT_SPIRV /* | SDL_GPU_SHADERFORMAT_DXIL */;
ctx->device = SDL_CreateGPUDevice(formats, true, NULL); ctx->device = SDL_CreateGPUDevice(formats, true, NULL);
if (!ctx->device) if (!ctx->device)
{ {