From 006548e00fa45cf6b1cdc1b0647efc8ae1c07c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Thu, 2 Jul 2020 19:50:09 -0700 Subject: [PATCH] Fixes for D3D12 on Linux. --- src/dxgi.cpp | 2 +- src/renderer_d3d12.cpp | 2 +- src/renderer_d3d12.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/dxgi.cpp b/src/dxgi.cpp index 155eb16d2..80bfbcc36 100644 --- a/src/dxgi.cpp +++ b/src/dxgi.cpp @@ -10,7 +10,7 @@ #include "dxgi.h" #include "renderer_d3d.h" -#if !BX_PLATFORM_WINDOWS +#if !BX_PLATFORM_WINDOWS && !BX_PLATFORM_LINUX # include # if BX_PLATFORM_WINRT # include diff --git a/src/renderer_d3d12.cpp b/src/renderer_d3d12.cpp index cfe59ce76..a172a5766 100644 --- a/src/renderer_d3d12.cpp +++ b/src/renderer_d3d12.cpp @@ -8,7 +8,7 @@ #if BGFX_CONFIG_RENDERER_DIRECT3D12 # include "renderer_d3d12.h" -#if !BX_PLATFORM_WINDOWS +#if !BX_PLATFORM_WINDOWS && !BX_PLATFORM_LINUX # include # if BX_PLATFORM_WINRT # include diff --git a/src/renderer_d3d12.h b/src/renderer_d3d12.h index 63651536b..f9b2ff553 100644 --- a/src/renderer_d3d12.h +++ b/src/renderer_d3d12.h @@ -6,10 +6,10 @@ #ifndef BGFX_RENDERER_D3D12_H_HEADER_GUARD #define BGFX_RENDERER_D3D12_H_HEADER_GUARD -#define USE_D3D12_DYNAMIC_LIB BX_PLATFORM_WINDOWS +#define USE_D3D12_DYNAMIC_LIB (BX_PLATFORM_WINDOWS || BX_PLATFORM_LINUX) #include -#if BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT +#if BX_PLATFORM_WINDOWS || BX_PLATFORM_WINRT || BX_PLATFORM_LINUX # include #else # if !BGFX_CONFIG_DEBUG