diff --git a/cmake/modules/AddLesson.cmake b/cmake/modules/AddLesson.cmake
index 1220354..9432e13 100644
--- a/cmake/modules/AddLesson.cmake
+++ b/cmake/modules/AddLesson.cmake
@@ -37,13 +37,13 @@ function (add_lesson target)
 			target_sources(${target} PRIVATE "${path}")
 			unset(path)
 		else()
-			if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-				# Copy D3D12 (DXIL) shaders into target shaders folder
-				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}.pxl.dxb"
-					"$<TARGET_FILE_DIR:${target}>/Data/Shaders")
-			endif()
+			#if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+			#	# Copy D3D12 (DXIL) shaders into target shaders folder
+			#	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}.pxl.dxb"
+			#		"$<TARGET_FILE_DIR:${target}>/Data/Shaders")
+			#endif()
 			# Copy Vulkan (SPIR-V) shaders into target shaders folder
 			add_custom_command(TARGET ${target} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
 				"${CMAKE_SOURCE_DIR}/data/shaders/${shader}.vtx.spv"
diff --git a/src/c/nehe.c b/src/c/nehe.c
index 3b746d4..edfe5bf 100644
--- a/src/c/nehe.c
+++ b/src/c/nehe.c
@@ -32,8 +32,9 @@ bool NeHe_InitGPU(NeHeContext* ctx, const char* title, int width, int height)
 
 	// Open GPU device
 	const SDL_GPUShaderFormat formats =
+		// FIXME: Re-enable D3D12 later when lesson9 works properly
 		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);
 	if (!ctx->device)
 	{