Skip to content

Commit f2e3f9e

Browse files
committed
Put HAVE_SLANG guards back in d3d10.c/d3d11.c/d3d12.c
1 parent 4be8b20 commit f2e3f9e

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

gfx/drivers/d3d10.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@
5454
#include "../common/dxgi_common.h"
5555
#include <d3d10.h>
5656
#include "../common/d3dcompiler_common.h"
57-
#ifdef HAVE_SLANG
57+
/* slang_process.h is self-contained - it only defines types and
58+
* constants used by pass state. The actual slang_process() call
59+
* sites remain guarded with HAVE_SLANG+HAVE_SPIRV_CROSS. */
5860
#include "../drivers_shader/slang_process.h"
59-
#endif
6061
#ifdef HAVE_MENU
6162
#include "../../menu/menu_driver.h"
6263
#endif

gfx/drivers/d3d11.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@
6868
#include <libretro.h>
6969
#include <libretro_d3d11.h>
7070
#include "../common/d3dcompiler_common.h"
71-
#ifdef HAVE_SLANG
71+
/* slang_process.h is self-contained - it only defines types and
72+
* constants used by pass state. The actual slang_process() call
73+
* sites remain guarded with HAVE_SLANG+HAVE_SPIRV_CROSS. */
7274
#include "../drivers_shader/slang_process.h"
73-
#endif
7475
#ifdef HAVE_THREADS
7576
#include "../video_thread_wrapper.h"
7677
#endif

gfx/drivers/d3d12.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,10 @@
7070
#include <libretro.h>
7171
#include <libretro_d3d12.h>
7272
#include "../common/d3dcompiler_common.h"
73-
#ifdef HAVE_SLANG
73+
/* slang_process.h is self-contained - it only defines types and
74+
* constants used by pass state. The actual slang_process() call
75+
* sites remain guarded with HAVE_SLANG+HAVE_SPIRV_CROSS. */
7476
#include "../drivers_shader/slang_process.h"
75-
#endif
7677
#ifdef HAVE_THREADS
7778
#include "../video_thread_wrapper.h"
7879
#endif

0 commit comments

Comments
 (0)