lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-07-31 11:51:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update overlays to use DXIL as needed

Browse Source 
* This is needed because D3D12 requires all shaders in a pipeline to use DXIL if
  any do.
* We try to bake the couple of DXIL shaders that we will mix-and-match with
  application shaders at build time, in case we aren't able to find a working
  dxcompiler at runtime to build them. But this can only happen if we find a
  working dxc.exe in one of the windows 10 SDKs.
This commit is contained in:
baldurk
2020-06-18 17:22:44 +01:00
parent 9f210d5617
commit 0bd48d3c2c
9 changed files with 261 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/data/hlsl/empty.dxbc
View File
renderdoc/data/renderdoc.rc
+23
View File
@@ -115,6 +115,29 @@ RESOURCE_quadoverdraw_hlsl TYPE_EMBED "hlsl/quadoverdraw.hlsl"
RESOURCE_texremap_hlsl TYPE_EMBED "hlsl/texremap.hlsl"
RESOURCE_fixedcol_hlsl TYPE_EMBED "hlsl/fixedcol.hlsl"
#ifdef RENDERDOC_BAKED_DXC_SHADERS
#if !defined(CONCAT)
#define CONCAT2(a, b) a##b
#define CONCAT(a, b) CONCAT2(a, b)
#endif
RESOURCE_fixedcol_0_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_0.dxbc)
RESOURCE_fixedcol_1_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_1.dxbc)
RESOURCE_fixedcol_2_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_2.dxbc)
RESOURCE_fixedcol_3_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, fixedcol_3.dxbc)
RESOURCE_quadwrite_dxbc TYPE_EMBED CONCAT(RENDERDOC_BAKED_PATH, quadwrite.dxbc)
#else
RESOURCE_fixedcol_0_dxbc TYPE_EMBED "hlsl/empty.dxbc"
RESOURCE_fixedcol_1_dxbc TYPE_EMBED "hlsl/empty.dxbc"
RESOURCE_fixedcol_2_dxbc TYPE_EMBED "hlsl/empty.dxbc"
RESOURCE_fixedcol_3_dxbc TYPE_EMBED "hlsl/empty.dxbc"
RESOURCE_quadwrite_dxbc TYPE_EMBED "hlsl/empty.dxbc"
#endif
RESOURCE_sourcecodepro_ttf TYPE_EMBED "sourcecodepro.ttf"
RESOURCE_glsl_blit_vert TYPE_EMBED "glsl/blit.vert"
renderdoc/data/resource.h
+6
View File
@@ -18,6 +18,12 @@
#define RESOURCE_texremap_hlsl 111
#define RESOURCE_fixedcol_hlsl 112
#define RESOURCE_fixedcol_0_dxbc 113
#define RESOURCE_fixedcol_1_dxbc 114
#define RESOURCE_fixedcol_2_dxbc 115
#define RESOURCE_fixedcol_3_dxbc 116
#define RESOURCE_quadwrite_dxbc 117
#define RESOURCE_sourcecodepro_ttf 301
#define RESOURCE_glsl_blit_vert 401