diff --git a/Makefile.libretro b/Makefile.libretro index 29175e31..3c62dc86 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -319,7 +319,8 @@ SOURCES_CXX += \ $(COMMON_DIR)/d3d11/shader_compiler.cpp \ $(COMMON_DIR)/d3d11/staging_texture.cpp \ $(COMMON_DIR)/d3d11/stream_buffer.cpp \ - $(COMMON_DIR)/d3d11/texture.cpp + $(COMMON_DIR)/d3d11/texture.cpp \ + $(COMMON_DIR)/d3d_common/embedded_shaders.cpp # Direct3D 12 backend - Windows only. d3d12 ships with Windows 10+ and # the libretro frontend exposes it via retro_hw_render_interface_d3d12. @@ -331,7 +332,6 @@ LDFLAGS += -ld3d12 SOURCES_CXX += \ $(COMMON_DIR)/d3d12/context.cpp \ $(COMMON_DIR)/d3d12/descriptor_heap_manager.cpp \ - $(COMMON_DIR)/d3d12/embedded_shaders.cpp \ $(COMMON_DIR)/d3d12/shader_cache.cpp \ $(COMMON_DIR)/d3d12/staging_texture.cpp \ $(COMMON_DIR)/d3d12/stream_buffer.cpp \ diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 1b679843..97114d18 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -108,6 +108,8 @@ if(WIN32) d3d11/stream_buffer.h d3d11/texture.cpp d3d11/texture.h + d3d_common/embedded_shaders.cpp + d3d_common/embedded_shaders.h display.hlsl.h windows_headers.h ) @@ -117,8 +119,6 @@ if(WIN32) d3d12/context.h d3d12/descriptor_heap_manager.cpp d3d12/descriptor_heap_manager.h - d3d12/embedded_shaders.cpp - d3d12/embedded_shaders.h d3d12/shader_cache.cpp d3d12/shader_cache.h d3d12/staging_texture.cpp diff --git a/src/common/d3d12/util.h b/src/common/d3d12/util.h index 3031a320..18a596d3 100644 --- a/src/common/d3d12/util.h +++ b/src/common/d3d12/util.h @@ -112,7 +112,7 @@ public: // Convenience overloads for D3D12_SHADER_BYTECODE - the natural form // for pre-baked DXBC blobs from src/common/d3d12/embedded_dxbc/, which // are returned as { data, size } aggregates by the - // D3D12::EmbeddedShaders helpers and by GPU_HW_D3D12's pre-bake + // D3DCommon::EmbeddedShaders helpers and by GPU_HW_D3D12's pre-bake // accessors. Just unwraps to the (data, size) overload above. void SetVertexShader(const D3D12_SHADER_BYTECODE& bc); void SetGeometryShader(const D3D12_SHADER_BYTECODE& bc); diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n0.inc index b9705a23..e5599d07 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n1.inc index c253c6e7..0e2ff190 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n0.inc index 7e2c647a..e99bd2ad 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 (no /D) // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n1.inc index e3649795..1bb0c4a1 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n0.inc index 6673d0d0..e34c8494 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n1.inc index 32155372..854c53e6 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d0_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n0.inc index bd1b852c..92b38052 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n1.inc index dce68a81..9a064b18 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n0.inc index 878f4ea2..aa5889bc 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n1.inc index 7458464a..8e8b9a30 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n0.inc index facc28a9..2eeee984 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n1.inc index e54e94d5..f5a11841 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r0_d1_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n0.inc index b2bfb097..2f39dc36 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n1.inc index 14d01edd..665e662e 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n0.inc index 0c3e62a5..600de9df 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n1.inc index dac1e0c0..e937c4fc 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n0.inc index 519c0f70..15fa9d18 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n1.inc index dae50b8f..cc33dab1 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d0_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n0.inc index 5eea7461..59268ca3 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n1.inc index 8b2c5e3d..1ddc87d6 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n0.inc index d58c86f2..ac882f71 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n1.inc index c1fea671..1a8dd331 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n0.inc index f5ac75da..406b9f41 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n1.inc index 09e1453a..d6a3be5d 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p0r1_d1_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n0.inc index d7821f5d..268cea2d 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n1.inc index ef65629e..afe434c3 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n0.inc index 99231468..e07edcff 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n1.inc index bc29ae9a..03b65a17 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n0.inc index 90d86fd4..712010e0 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n1.inc index 3312b745..a54d952c 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d0_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n0.inc index ff681580..3128574a 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n1.inc index 9e8c48df..c15fc270 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n0.inc index 03bb6370..9167391f 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DUSE_DUAL_SOURCE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n1.inc index 438a9f23..4c107607 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DUSE_DUAL_SOURCE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n0.inc index 88c38a30..aea4ab28 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n1.inc index ca101cd6..cda8f3e5 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r0_d1_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n0.inc index e444bc5f..c8979108 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n1.inc index b94fafd4..e59e752b 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n0.inc index 206d3952..bfbb9fe3 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n1.inc index b73be5a0..eaf9d3f4 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n0.inc index b913f75d..aa9d2639 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n1.inc index fef09256..bb856705 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d0_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n0.inc index 6fd18892..ed52c8f7 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n1.inc index ca18c3af..dfde4117 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n0.inc index d23b155a..97058c9e 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n1.inc index 2dfe3506..7f3fc21b 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n0.inc index 41cac965..59b09296 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n1.inc index c3567b62..0e1c3d1a 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p4r1_d1_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_4_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n0.inc index 66445cb4..dec9fa15 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n1.inc index ba230f40..216fa853 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n0.inc index e660d2cd..fd4bd0a4 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n1.inc index b29c522e..083d8090 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n0.inc index f062a188..d0401984 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n1.inc index e0536d32..b29c4bf9 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d0_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n0.inc index 6c96cdb8..6efeab9f 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n1.inc index 0bae44fd..e715b418 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n0.inc index bfeb953c..025024c1 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DUSE_DUAL_SOURCE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n1.inc index 7ed23417..26d82109 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DUSE_DUAL_SOURCE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n0.inc index a184d931..a7c29d85 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n1.inc index 2b8f6a19..5d96b0b6 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r0_d1_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n0.inc index d4f0cbda..151c7d65 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n1.inc index 30c35638..3b7d5432 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n0.inc index 91d20033..8537a4f5 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n1.inc index abe35832..696b5476 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n0.inc index 2bc1cdfc..36d7badb 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n1.inc index 1a4a3e59..58b38ccb 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d0_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n0.inc index 63075bb7..a92b3f7d 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n1.inc index d0db2a54..8bb9d67d 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_centroid_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n0.inc index 694a8d76..420a942f 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n1.inc index d468a0a8..926b4432 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_none_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n0.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n0.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n0.inc index 266ee6d6..7f4ced44 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n1.inc b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n1.inc rename to src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n1.inc index 1533a977..ee5a4f6c 100644 --- a/src/common/d3d12/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPALETTE_8_BIT=1 /DRAW_TEXTURE=1 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_centroid_p0.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_centroid_p0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_centroid_p0.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_centroid_p0.inc index df6ac589..a8b95e8b 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_centroid_p0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_centroid_p0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_centroid_p1.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_centroid_p1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_centroid_p1.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_centroid_p1.inc index cf882944..39254f37 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_centroid_p1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_centroid_p1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_none_p0.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_none_p0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_none_p0.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_none_p0.inc index 6447590c..fbc8fa4e 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_none_p0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_none_p0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 (no /D) // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_none_p1.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_none_p1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_none_p1.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_none_p1.inc index cc6801bf..2b496a8d 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_none_p1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_none_p1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_sample_p0.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_sample_p0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_sample_p0.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_sample_p0.inc index 5b382657..6a6a6c23 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_sample_p0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_sample_p0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_sample_p1.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_sample_p1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_sample_p1.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_sample_p1.inc index abb0f834..be02a408 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d0_sample_p1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d0_sample_p1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_centroid_p0.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_centroid_p0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_centroid_p0.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_centroid_p0.inc index 9a7a5304..3a1793f8 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_centroid_p0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_centroid_p0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_centroid_p1.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_centroid_p1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_centroid_p1.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_centroid_p1.inc index 1b9708be..78adbc32 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_centroid_p1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_centroid_p1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_CENTROID=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_none_p0.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_none_p0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_none_p0.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_none_p0.inc index b05b3a4d..6cd271a3 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_none_p0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_none_p0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_none_p1.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_none_p1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_none_p1.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_none_p1.inc index 22cdf255..8236c62f 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_none_p1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_none_p1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_sample_p0.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_sample_p0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_sample_p0.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_sample_p0.inc index d1bad37a..3de07355 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_sample_p0.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_sample_p0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_sample_p1.inc b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_sample_p1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_sample_p1.inc rename to src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_sample_p1.inc index 651ec033..d7745c8e 100644 --- a/src/common/d3d12/embedded_dxbc/batch_untextured_ps_d1_sample_p1.inc +++ b/src/common/d3d_common/embedded_dxbc/batch_untextured_ps_d1_sample_p1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DUSE_DUAL_SOURCE=1 /DINTERP_SAMPLE=1 /DNOPERSP=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/copy_ps.inc b/src/common/d3d_common/embedded_dxbc/copy_ps.inc similarity index 98% rename from src/common/d3d12/embedded_dxbc/copy_ps.inc rename to src/common/d3d_common/embedded_dxbc/copy_ps.inc index 54765ff3..6a61c5c4 100644 --- a/src/common/d3d12/embedded_dxbc/copy_ps.inc +++ b/src/common/d3d_common/embedded_dxbc/copy_ps.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 (no /D) // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m01.inc index 0b2e705e..09c147fe 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m02.inc index 3f43783e..274a8a3c 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m04.inc index bd6e930f..0c70ed5e 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m08.inc index 8402e8ea..32660347 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m16.inc index cdf376f3..248c31ee 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m32.inc index 7649c181..0ad7fdad 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i0c0m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i0c0m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m01.inc index f4a076ba..218f15b4 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m02.inc index 970452bd..935c0dc6 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m04.inc index 6d5b8765..4de7242a 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m08.inc index ae78eb5c..effc85ee 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m16.inc index 08b7024f..78f365af 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m32.inc index d91aefde..a4d972be 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i1c0m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i1c0m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m01.inc index 9631508b..ee063ff4 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m02.inc index 84ee1dab..28f3af9e 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m04.inc index 3ce66525..519ab1de 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m08.inc index 77a92aca..0658aeec 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m16.inc index 5478f90f..bad94fe7 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m32.inc index d3d04461..e578b72c 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d0i2c0m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d0i2c0m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=0 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m01.inc index 5bb236fd..02c40083 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m02.inc index 7a0b8d48..229bfcdc 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m04.inc index 10cc7c4f..0575142f 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m08.inc index 31f40521..28451ab2 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m16.inc index da471b26..d9abedc2 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m32.inc index b9ea6620..6c5d80e6 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c0m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c0m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m01.inc index 6c031dfb..38c383fb 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m02.inc index 0d2c07ad..a23dd6de 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m04.inc index 32e76365..b304e8db 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m08.inc index cc77d45c..4df9e140 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m16.inc index b524751e..6da95cf4 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m32.inc index df2c25aa..d2a2ace2 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i0c1m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i0c1m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=0 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m01.inc index a658325a..be86a8f5 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m02.inc index 25217a3c..551d6b4d 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m04.inc index 3ec11e06..a0d8a814 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m08.inc index a7513d34..cfdd9e29 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m16.inc index 943e4a9f..4e2d3672 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m32.inc index 86a74ef0..fbea931d 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c0m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c0m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m01.inc index d198455a..9666113a 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m02.inc index 34393946..84a3fbde 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m04.inc index dbab1d21..1a35f49f 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m08.inc index b992987d..21cd0748 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m16.inc index 9b6db5dd..a1754bc9 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m32.inc index 0eba1e70..5d5c8b0a 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i1c1m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i1c1m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=1 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m01.inc index 4fb9e79c..97917014 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m02.inc index cccb9bfd..95314807 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m04.inc index 79327dc9..4eac5f0f 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m08.inc index 5aa271a2..257feba7 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m16.inc index a3924739..afe73827 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m32.inc index 96bfd86b..8eb635c7 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c0m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c0m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=0 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m01.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m01.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m01.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m01.inc index 8d1cc717..9a6a0f8a 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m01.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m01.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m02.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m02.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m02.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m02.inc index 86154bfd..aa6f984b 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m02.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m02.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m04.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m04.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m04.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m04.inc index 7037c94f..47ff01fb 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m04.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m04.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m08.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m08.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m08.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m08.inc index 2ae01a4a..4f0b411c 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m08.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m08.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m16.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m16.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m16.inc index 18aaec82..fd335120 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m16.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m32.inc b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m32.inc rename to src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m32.inc index 149b269a..02c73a85 100644 --- a/src/common/d3d12/embedded_dxbc/display_ps_d1i2c1m32.inc +++ b/src/common/d3d_common/embedded_dxbc/display_ps_d1i2c1m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DDEPTH_24BIT=1 /DINTERLACED=1 /DINTERLEAVED=0 /DSMOOTH_CHROMA=1 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/fullscreen_quad_vs.inc b/src/common/d3d_common/embedded_dxbc/fullscreen_quad_vs.inc similarity index 98% rename from src/common/d3d12/embedded_dxbc/fullscreen_quad_vs.inc rename to src/common/d3d_common/embedded_dxbc/fullscreen_quad_vs.inc index 4f98a9f3..a8af31d4 100644 --- a/src/common/d3d12/embedded_dxbc/fullscreen_quad_vs.inc +++ b/src/common/d3d_common/embedded_dxbc/fullscreen_quad_vs.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T vs_5_0 /E main /O3 (no /D) // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_copy_ps_pgxp0.inc b/src/common/d3d_common/embedded_dxbc/vram_copy_ps_pgxp0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_copy_ps_pgxp0.inc rename to src/common/d3d_common/embedded_dxbc/vram_copy_ps_pgxp0.inc index 5f682471..65cf0baf 100644 --- a/src/common/d3d12/embedded_dxbc/vram_copy_ps_pgxp0.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_copy_ps_pgxp0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=0 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_copy_ps_pgxp1.inc b/src/common/d3d_common/embedded_dxbc/vram_copy_ps_pgxp1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_copy_ps_pgxp1.inc rename to src/common/d3d_common/embedded_dxbc/vram_copy_ps_pgxp1.inc index a004dd99..ed61de1e 100644 --- a/src/common/d3d12/embedded_dxbc/vram_copy_ps_pgxp1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_copy_ps_pgxp1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w0i0.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w0i0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w0i0.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w0i0.inc index 74306ab7..da0d6104 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w0i0.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w0i0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=0 /DWRAPPED=0 /DINTERLACED=0 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w0i1.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w0i1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w0i1.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w0i1.inc index 04a024e6..71cc4c06 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w0i1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w0i1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=0 /DWRAPPED=0 /DINTERLACED=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w1i0.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w1i0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w1i0.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w1i0.inc index af30115a..34510517 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w1i0.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w1i0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=0 /DWRAPPED=1 /DINTERLACED=0 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w1i1.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w1i1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w1i1.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w1i1.inc index 8c016e67..af7cd1b7 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p0w1i1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p0w1i1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=0 /DWRAPPED=1 /DINTERLACED=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w0i0.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w0i0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w0i0.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w0i0.inc index 8379ece1..9f72a8dc 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w0i0.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w0i0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=1 /DWRAPPED=0 /DINTERLACED=0 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w0i1.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w0i1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w0i1.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w0i1.inc index e8560d65..893bd8a6 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w0i1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w0i1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=1 /DWRAPPED=0 /DINTERLACED=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w1i0.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w1i0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w1i0.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w1i0.inc index 49c8986f..4258ebf9 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w1i0.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w1i0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=1 /DWRAPPED=1 /DINTERLACED=0 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w1i1.inc b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w1i1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w1i1.inc rename to src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w1i1.inc index b3b22690..467ba189 100644 --- a/src/common/d3d12/embedded_dxbc/vram_fill_ps_p1w1i1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_fill_ps_p1w1i1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=1 /DWRAPPED=1 /DINTERLACED=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_read_ps_m1.inc b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_read_ps_m1.inc rename to src/common/d3d_common/embedded_dxbc/vram_read_ps_m1.inc index 48c6eec2..6cfc25e8 100644 --- a/src/common/d3d12/embedded_dxbc/vram_read_ps_m1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLES=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_read_ps_m16.inc b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m16.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_read_ps_m16.inc rename to src/common/d3d_common/embedded_dxbc/vram_read_ps_m16.inc index 5f1d2991..315ed32e 100644 --- a/src/common/d3d12/embedded_dxbc/vram_read_ps_m16.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m16.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLES=16 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_read_ps_m2.inc b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m2.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_read_ps_m2.inc rename to src/common/d3d_common/embedded_dxbc/vram_read_ps_m2.inc index 0f31d4ec..3bf3ea5c 100644 --- a/src/common/d3d12/embedded_dxbc/vram_read_ps_m2.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m2.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLES=2 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_read_ps_m32.inc b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m32.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_read_ps_m32.inc rename to src/common/d3d_common/embedded_dxbc/vram_read_ps_m32.inc index c9342ddf..167b2739 100644 --- a/src/common/d3d12/embedded_dxbc/vram_read_ps_m32.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m32.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLES=32 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_read_ps_m4.inc b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m4.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_read_ps_m4.inc rename to src/common/d3d_common/embedded_dxbc/vram_read_ps_m4.inc index c05840ef..29ab8dd1 100644 --- a/src/common/d3d12/embedded_dxbc/vram_read_ps_m4.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m4.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLES=4 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_read_ps_m8.inc b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m8.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_read_ps_m8.inc rename to src/common/d3d_common/embedded_dxbc/vram_read_ps_m8.inc index f1bc9f91..8ed34922 100644 --- a/src/common/d3d12/embedded_dxbc/vram_read_ps_m8.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_read_ps_m8.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLES=8 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_update_depth_ps_msaa0.inc b/src/common/d3d_common/embedded_dxbc/vram_update_depth_ps_msaa0.inc similarity index 98% rename from src/common/d3d12/embedded_dxbc/vram_update_depth_ps_msaa0.inc rename to src/common/d3d_common/embedded_dxbc/vram_update_depth_ps_msaa0.inc index 7fc4ae43..92914b8f 100644 --- a/src/common/d3d12/embedded_dxbc/vram_update_depth_ps_msaa0.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_update_depth_ps_msaa0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLING=0 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_update_depth_ps_msaa1.inc b/src/common/d3d_common/embedded_dxbc/vram_update_depth_ps_msaa1.inc similarity index 98% rename from src/common/d3d12/embedded_dxbc/vram_update_depth_ps_msaa1.inc rename to src/common/d3d_common/embedded_dxbc/vram_update_depth_ps_msaa1.inc index 3c2a001b..e70bd50f 100644 --- a/src/common/d3d12/embedded_dxbc/vram_update_depth_ps_msaa1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_update_depth_ps_msaa1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DMULTISAMPLING=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_write_ps_pgxp0.inc b/src/common/d3d_common/embedded_dxbc/vram_write_ps_pgxp0.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_write_ps_pgxp0.inc rename to src/common/d3d_common/embedded_dxbc/vram_write_ps_pgxp0.inc index d83044d7..510ed3dd 100644 --- a/src/common/d3d12/embedded_dxbc/vram_write_ps_pgxp0.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_write_ps_pgxp0.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=0 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_dxbc/vram_write_ps_pgxp1.inc b/src/common/d3d_common/embedded_dxbc/vram_write_ps_pgxp1.inc similarity index 99% rename from src/common/d3d12/embedded_dxbc/vram_write_ps_pgxp1.inc rename to src/common/d3d_common/embedded_dxbc/vram_write_ps_pgxp1.inc index 95013529..e2dec214 100644 --- a/src/common/d3d12/embedded_dxbc/vram_write_ps_pgxp1.inc +++ b/src/common/d3d_common/embedded_dxbc/vram_write_ps_pgxp1.inc @@ -2,7 +2,7 @@ // DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py. // fxc /T ps_5_0 /E main /O3 /DPGXP_DEPTH=1 // -// Included inside namespace D3D12::EmbeddedShaders in +// Included inside namespace D3DCommon::EmbeddedShaders in // embedded_shaders.cpp. The matching extern declaration lives in // embedded_shaders.h. diff --git a/src/common/d3d12/embedded_shaders.cpp b/src/common/d3d_common/embedded_shaders.cpp similarity index 96% rename from src/common/d3d12/embedded_shaders.cpp rename to src/common/d3d_common/embedded_shaders.cpp index a3cd7413..eb53adf7 100644 --- a/src/common/d3d12/embedded_shaders.cpp +++ b/src/common/d3d_common/embedded_shaders.cpp @@ -11,11 +11,12 @@ // // Mirror of src/common/vulkan/embedded_shaders.cpp. The Vulkan side wraps // its embedded blobs in a CreateShaderModule helper because vkCreateShaderModule -// is the API hand-off; the D3D12 side has no equivalent API call - the -// caller drops the (data, size) pair straight into a D3D12_SHADER_BYTECODE -// aggregate at PSO-creation time. So this TU stays simple: just the .inc -// includes and the namespace. -namespace D3D12::EmbeddedShaders { +// is the API hand-off; the D3D paths have no equivalent API call - the +// caller drops the (data, size) pair straight into either a +// D3D12_SHADER_BYTECODE aggregate at PSO-creation time (D3D12) or an +// ID3D11Device::CreatePixelShader(bytecode, size, ...) call (D3D11). +// So this TU stays simple: just the .inc includes and the namespace. +namespace D3DCommon::EmbeddedShaders { #include "embedded_dxbc/fullscreen_quad_vs.inc" #include "embedded_dxbc/copy_ps.inc" @@ -180,4 +181,4 @@ namespace D3D12::EmbeddedShaders { #include "embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n0.inc" #include "embedded_dxbc/batch_textured_nearest_ps_p8r1_d1_sample_n1.inc" -} // namespace D3D12::EmbeddedShaders +} // namespace D3DCommon::EmbeddedShaders diff --git a/src/common/d3d12/embedded_shaders.h b/src/common/d3d_common/embedded_shaders.h similarity index 95% rename from src/common/d3d12/embedded_shaders.h rename to src/common/d3d_common/embedded_shaders.h index ecc89cf6..7f9b0896 100644 --- a/src/common/d3d12/embedded_shaders.h +++ b/src/common/d3d_common/embedded_shaders.h @@ -7,29 +7,40 @@ #include #include -// Pre-compiled DXBC blobs for the D3D12 backend. +// Pre-compiled DXBC blobs shared between the D3D11 and D3D12 backends. // // Each blob is generated offline by tools/regen_d3d12_dxbc.py from the // matching HLSL source under data/shaders/d3d12/, and checked into -// src/common/d3d12/embedded_dxbc/. Nothing in the build system invokes -// fxc.exe / D3DCompile - the .inc files are consumed as plain C++ arrays. -// See data/shaders/d3d12/README.md for the editing workflow. +// src/common/d3d_common/embedded_dxbc/. Nothing in the build system +// invokes fxc.exe / D3DCompile - the .inc files are consumed as plain +// C++ arrays. See data/shaders/d3d12/README.md for the editing +// workflow. +// +// fxc emits DXBC bytecode at the ps_5_0 / vs_5_0 / cs_5_0 / gs_5_0 +// targets that both D3D11 (CreatePixelShader from raw bytecode, same +// signature as src/common/display.hlsl.h's pre-baked precedent) and +// D3D12 (ID3D12PipelineState's D3D12_SHADER_BYTECODE aggregate) +// consume identically. The HLSL in data/shaders/d3d12/ uses no +// API-version-specific constructs - register binding declarations +// (cbuffer at b0, Texture2D at t0, SamplerState at s0) are honoured +// by both backends and live in the DXBC reflection metadata. // // This path replaces the runtime HLSL -> DXBC step done in -// D3D11::ShaderCompiler::CompileShader (shared between the D3D11 and D3D12 -// backends) for the shaders that have been pre-baked. Until every shader -// has been pre-baked, the runtime path and D3DCompile still cover the -// remainder. +// D3D11::ShaderCompiler::CompileShader (shared between the D3D11 and +// D3D12 backends) for the shaders that have been pre-baked. Until +// every shader has been pre-baked, the runtime path and D3DCompile +// still cover the remainder. // -// Mirror of src/common/vulkan/embedded_shaders.h for the Vulkan backend. -// As individual shaders get migrated off the runtime ShaderGen path, this -// header gains a pair of extern declarations per blob: +// Mirror of src/common/vulkan/embedded_shaders.h for the Vulkan +// backend. As individual shaders get migrated off the runtime +// ShaderGen path, this header gains a pair of extern declarations +// per blob: // // extern const uint8_t k__ps[]; // extern const size_t k__ps_size_bytes; // -// (or _vs / _cs / _gs depending on stage). Blob variants with /D defines -// get a suffix per the TEMPLATE_VARIANTS table in +// (or _vs / _cs / _gs depending on stage). Blob variants with /D +// defines get a suffix per the TEMPLATE_VARIANTS table in // tools/regen_d3d12_dxbc.py. // // Constructing a D3D12_SHADER_BYTECODE at the PSO creation site is a @@ -37,7 +48,12 @@ // // D3D12_SHADER_BYTECODE bc = { k__ps, k__ps_size_bytes }; // -namespace D3D12::EmbeddedShaders { +// On D3D11, the matching call is +// ID3D11Device::CreatePixelShader(bc.pShaderBytecode, bc.BytecodeLength, +// nullptr, ...), wrapped by +// D3D11::ShaderCompiler::CreatePixelShader(device, bytecode, size). +// +namespace D3DCommon::EmbeddedShaders { // Fullscreen-quad vertex shader. Emits a fullscreen triangle in NDC // from SV_VertexID 0..2 via the standard bit-shift trick - equivalent @@ -566,4 +582,4 @@ extern const uint8_t k_batch_textured_nearest_ps_p8r1_d1_sample_n1[]; extern const size_t k_batch_textured_nearest_ps_p8r1_d1_sample_n1_size_bytes; -} // namespace D3D12::EmbeddedShaders +} // namespace D3DCommon::EmbeddedShaders diff --git a/src/core/gpu_hw_d3d12.cpp b/src/core/gpu_hw_d3d12.cpp index f3df58ee..c7ddc833 100644 --- a/src/core/gpu_hw_d3d12.cpp +++ b/src/core/gpu_hw_d3d12.cpp @@ -3,7 +3,7 @@ #include "common/d3d11/shader_compiler.h" #include "common/d3d12/context.h" #include "common/d3d12/descriptor_heap_manager.h" -#include "common/d3d12/embedded_shaders.h" +#include "common/d3d_common/embedded_shaders.h" #include "common/d3d12/shader_cache.h" #include "common/d3d12/util.h" #include "common/log.h" @@ -1200,43 +1200,43 @@ static D3D12_SHADER_BYTECODE PickBatchUntexturedFSBytecode( // .inc filenames. Each entry is a // D3D12_SHADER_BYTECODE { pShaderBytecode, BytecodeLength } // aggregate; the extern declarations in - // src/common/d3d12/embedded_shaders.h supply both halves. + // src/common/d3d_common/embedded_shaders.h supply both halves. static const D3D12_SHADER_BYTECODE k_blobs[2][3][2] = { // dual = 0 { // interp = none - {{D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_none_p0, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_none_p0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_none_p1, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_none_p1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_none_p0, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_none_p0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_none_p1, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_none_p1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p0, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p1, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p0, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p1, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_centroid_p1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p0, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p1, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p0, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p1, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d0_sample_p1_size_bytes}}, }, // dual = 1 { // interp = none - {{D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_none_p0, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_none_p0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_none_p1, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_none_p1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_none_p0, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_none_p0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_none_p1, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_none_p1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p0, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p1, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p0, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p1, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_centroid_p1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p0, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p1, - D3D12::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p0, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p1, + D3DCommon::EmbeddedShaders::k_batch_untextured_ps_d1_sample_p1_size_bytes}}, }, }; @@ -1307,38 +1307,38 @@ static D3D12_SHADER_BYTECODE PickBatchTexturedNearestFSBytecode( // no dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d0_sample_n1_size_bytes}}, }, // dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r0_d1_sample_n1_size_bytes}}, }, }, // tm = p0r1 (RawDirect16Bit) @@ -1346,38 +1346,38 @@ static D3D12_SHADER_BYTECODE PickBatchTexturedNearestFSBytecode( // no dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d0_sample_n1_size_bytes}}, }, // dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p0r1_d1_sample_n1_size_bytes}}, }, }, // tm = p4r0 (Palette4Bit) @@ -1385,38 +1385,38 @@ static D3D12_SHADER_BYTECODE PickBatchTexturedNearestFSBytecode( // no dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d0_sample_n1_size_bytes}}, }, // dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r0_d1_sample_n1_size_bytes}}, }, }, // tm = p4r1 (RawPalette4Bit) @@ -1424,38 +1424,38 @@ static D3D12_SHADER_BYTECODE PickBatchTexturedNearestFSBytecode( // no dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d0_sample_n1_size_bytes}}, }, // dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p4r1_d1_sample_n1_size_bytes}}, }, }, // tm = p8r0 (Palette8Bit) @@ -1463,38 +1463,38 @@ static D3D12_SHADER_BYTECODE PickBatchTexturedNearestFSBytecode( // no dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d0_sample_n1_size_bytes}}, }, // dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r0_d1_sample_n1_size_bytes}}, }, }, // tm = p8r1 (RawPalette8Bit) @@ -1502,38 +1502,38 @@ static D3D12_SHADER_BYTECODE PickBatchTexturedNearestFSBytecode( // no dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d0_sample_n1_size_bytes}}, }, // dual { // interp = none - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_none_n1_size_bytes}}, // interp = centroid - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_centroid_n1_size_bytes}}, // interp = sample - {{D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n0, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n0_size_bytes}, - {D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n1, - D3D12::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n0, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n1, + D3DCommon::EmbeddedShaders::k_batch_textured_nearest_ps_p8r1_d1_sample_n1_size_bytes}}, }, }, }; @@ -1866,7 +1866,7 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetBatchPipeline(GPUText // once the slot is filled. // // The shared fullscreen-quad vertex shader is pre-baked DXBC (see -// GetFullscreenQuadVertexShader and src/common/d3d12/embedded_shaders.h), +// GetFullscreenQuadVertexShader and src/common/d3d_common/embedded_shaders.h), // statically linked - no compile, no caching state, no mutex. PSO // helpers below treat it as a free dependency. // ---------------------------------------------------------------------- @@ -1879,8 +1879,8 @@ D3D12_SHADER_BYTECODE GPU_HW_D3D12::GetFullscreenQuadVertexShader() // data/shaders/d3d12/fullscreen_quad.vs.hlsl). All callers receive // the same const view; the storage outlives every PSO that binds it. return D3D12_SHADER_BYTECODE{ - D3D12::EmbeddedShaders::k_fullscreen_quad_vs, - D3D12::EmbeddedShaders::k_fullscreen_quad_vs_size_bytes, + D3DCommon::EmbeddedShaders::k_fullscreen_quad_vs, + D3DCommon::EmbeddedShaders::k_fullscreen_quad_vs_size_bytes, }; } @@ -1909,28 +1909,28 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetVRAMFillPipeline(uint // pgxp = 0 { // wrapped = 0 - {{D3D12::EmbeddedShaders::k_vram_fill_ps_p0w0i0, - D3D12::EmbeddedShaders::k_vram_fill_ps_p0w0i0_size_bytes}, - {D3D12::EmbeddedShaders::k_vram_fill_ps_p0w0i1, - D3D12::EmbeddedShaders::k_vram_fill_ps_p0w0i1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w0i0, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w0i0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w0i1, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w0i1_size_bytes}}, // wrapped = 1 - {{D3D12::EmbeddedShaders::k_vram_fill_ps_p0w1i0, - D3D12::EmbeddedShaders::k_vram_fill_ps_p0w1i0_size_bytes}, - {D3D12::EmbeddedShaders::k_vram_fill_ps_p0w1i1, - D3D12::EmbeddedShaders::k_vram_fill_ps_p0w1i1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w1i0, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w1i0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w1i1, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p0w1i1_size_bytes}}, }, // pgxp = 1 { // wrapped = 0 - {{D3D12::EmbeddedShaders::k_vram_fill_ps_p1w0i0, - D3D12::EmbeddedShaders::k_vram_fill_ps_p1w0i0_size_bytes}, - {D3D12::EmbeddedShaders::k_vram_fill_ps_p1w0i1, - D3D12::EmbeddedShaders::k_vram_fill_ps_p1w0i1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w0i0, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w0i0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w0i1, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w0i1_size_bytes}}, // wrapped = 1 - {{D3D12::EmbeddedShaders::k_vram_fill_ps_p1w1i0, - D3D12::EmbeddedShaders::k_vram_fill_ps_p1w1i0_size_bytes}, - {D3D12::EmbeddedShaders::k_vram_fill_ps_p1w1i1, - D3D12::EmbeddedShaders::k_vram_fill_ps_p1w1i1_size_bytes}}, + {{D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w1i0, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w1i0_size_bytes}, + {D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w1i1, + D3DCommon::EmbeddedShaders::k_vram_fill_ps_p1w1i1_size_bytes}}, }, }; const D3D12_SHADER_BYTECODE fs = @@ -1995,10 +1995,10 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetVRAMCopyPipeline(uint // blob per PGXP value serves every resolution scale. const D3D12_SHADER_BYTECODE fs = m_pgxp_depth_buffer - ? D3D12_SHADER_BYTECODE{D3D12::EmbeddedShaders::k_vram_copy_ps_pgxp1, - D3D12::EmbeddedShaders::k_vram_copy_ps_pgxp1_size_bytes} - : D3D12_SHADER_BYTECODE{D3D12::EmbeddedShaders::k_vram_copy_ps_pgxp0, - D3D12::EmbeddedShaders::k_vram_copy_ps_pgxp0_size_bytes}; + ? D3D12_SHADER_BYTECODE{D3DCommon::EmbeddedShaders::k_vram_copy_ps_pgxp1, + D3DCommon::EmbeddedShaders::k_vram_copy_ps_pgxp1_size_bytes} + : D3D12_SHADER_BYTECODE{D3DCommon::EmbeddedShaders::k_vram_copy_ps_pgxp0, + D3DCommon::EmbeddedShaders::k_vram_copy_ps_pgxp0_size_bytes}; D3D12::GraphicsPipelineBuilder gpbuilder; gpbuilder.SetRootSignature(m_single_sampler_root_signature.Get()); @@ -2059,10 +2059,10 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetVRAMWritePipeline(uin // scale. const D3D12_SHADER_BYTECODE fs = m_pgxp_depth_buffer - ? D3D12_SHADER_BYTECODE{D3D12::EmbeddedShaders::k_vram_write_ps_pgxp1, - D3D12::EmbeddedShaders::k_vram_write_ps_pgxp1_size_bytes} - : D3D12_SHADER_BYTECODE{D3D12::EmbeddedShaders::k_vram_write_ps_pgxp0, - D3D12::EmbeddedShaders::k_vram_write_ps_pgxp0_size_bytes}; + ? D3D12_SHADER_BYTECODE{D3DCommon::EmbeddedShaders::k_vram_write_ps_pgxp1, + D3DCommon::EmbeddedShaders::k_vram_write_ps_pgxp1_size_bytes} + : D3D12_SHADER_BYTECODE{D3DCommon::EmbeddedShaders::k_vram_write_ps_pgxp0, + D3DCommon::EmbeddedShaders::k_vram_write_ps_pgxp0_size_bytes}; D3D12::GraphicsPipelineBuilder gpbuilder; gpbuilder.SetRootSignature(m_single_sampler_root_signature.Get()); @@ -2125,10 +2125,10 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetVRAMUpdateDepthPipeli // unchanged. const D3D12_SHADER_BYTECODE fs = (m_multisamples > 1) - ? D3D12_SHADER_BYTECODE{D3D12::EmbeddedShaders::k_vram_update_depth_ps_msaa1, - D3D12::EmbeddedShaders::k_vram_update_depth_ps_msaa1_size_bytes} - : D3D12_SHADER_BYTECODE{D3D12::EmbeddedShaders::k_vram_update_depth_ps_msaa0, - D3D12::EmbeddedShaders::k_vram_update_depth_ps_msaa0_size_bytes}; + ? D3D12_SHADER_BYTECODE{D3DCommon::EmbeddedShaders::k_vram_update_depth_ps_msaa1, + D3DCommon::EmbeddedShaders::k_vram_update_depth_ps_msaa1_size_bytes} + : D3D12_SHADER_BYTECODE{D3DCommon::EmbeddedShaders::k_vram_update_depth_ps_msaa0, + D3DCommon::EmbeddedShaders::k_vram_update_depth_ps_msaa0_size_bytes}; // VRAM update depth differs from the other VRAM ops in three // ways: it uses m_batch_root_signature (the regular ops use the @@ -2207,28 +2207,28 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetVRAMReadbackPipeline( switch (m_multisamples) { case 1: - fs = {D3D12::EmbeddedShaders::k_vram_read_ps_m1, - D3D12::EmbeddedShaders::k_vram_read_ps_m1_size_bytes}; + fs = {D3DCommon::EmbeddedShaders::k_vram_read_ps_m1, + D3DCommon::EmbeddedShaders::k_vram_read_ps_m1_size_bytes}; break; case 2: - fs = {D3D12::EmbeddedShaders::k_vram_read_ps_m2, - D3D12::EmbeddedShaders::k_vram_read_ps_m2_size_bytes}; + fs = {D3DCommon::EmbeddedShaders::k_vram_read_ps_m2, + D3DCommon::EmbeddedShaders::k_vram_read_ps_m2_size_bytes}; break; case 4: - fs = {D3D12::EmbeddedShaders::k_vram_read_ps_m4, - D3D12::EmbeddedShaders::k_vram_read_ps_m4_size_bytes}; + fs = {D3DCommon::EmbeddedShaders::k_vram_read_ps_m4, + D3DCommon::EmbeddedShaders::k_vram_read_ps_m4_size_bytes}; break; case 8: - fs = {D3D12::EmbeddedShaders::k_vram_read_ps_m8, - D3D12::EmbeddedShaders::k_vram_read_ps_m8_size_bytes}; + fs = {D3DCommon::EmbeddedShaders::k_vram_read_ps_m8, + D3DCommon::EmbeddedShaders::k_vram_read_ps_m8_size_bytes}; break; case 16: - fs = {D3D12::EmbeddedShaders::k_vram_read_ps_m16, - D3D12::EmbeddedShaders::k_vram_read_ps_m16_size_bytes}; + fs = {D3DCommon::EmbeddedShaders::k_vram_read_ps_m16, + D3DCommon::EmbeddedShaders::k_vram_read_ps_m16_size_bytes}; break; case 32: - fs = {D3D12::EmbeddedShaders::k_vram_read_ps_m32, - D3D12::EmbeddedShaders::k_vram_read_ps_m32_size_bytes}; + fs = {D3DCommon::EmbeddedShaders::k_vram_read_ps_m32, + D3DCommon::EmbeddedShaders::k_vram_read_ps_m32_size_bytes}; break; default: Log_WarningPrintf( @@ -2236,8 +2236,8 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetVRAMReadbackPipeline( "{1,2,4,8,16,32}; falling back to m1 blob (VRAM readback may " "average samples incorrectly)", m_multisamples); - fs = {D3D12::EmbeddedShaders::k_vram_read_ps_m1, - D3D12::EmbeddedShaders::k_vram_read_ps_m1_size_bytes}; + fs = {D3DCommon::EmbeddedShaders::k_vram_read_ps_m1, + D3DCommon::EmbeddedShaders::k_vram_read_ps_m1_size_bytes}; break; } @@ -2328,48 +2328,48 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetDisplayPipeline(uint8 static const D3D12_SHADER_BYTECODE k_display_d0[3][6] = { // interlace_mode = 0 { - {D3D12::EmbeddedShaders::k_display_ps_d0i0c0m01, - D3D12::EmbeddedShaders::k_display_ps_d0i0c0m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i0c0m02, - D3D12::EmbeddedShaders::k_display_ps_d0i0c0m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i0c0m04, - D3D12::EmbeddedShaders::k_display_ps_d0i0c0m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i0c0m08, - D3D12::EmbeddedShaders::k_display_ps_d0i0c0m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i0c0m16, - D3D12::EmbeddedShaders::k_display_ps_d0i0c0m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i0c0m32, - D3D12::EmbeddedShaders::k_display_ps_d0i0c0m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m01, + D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m02, + D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m04, + D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m08, + D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m16, + D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m32, + D3DCommon::EmbeddedShaders::k_display_ps_d0i0c0m32_size_bytes}, }, // interlace_mode = 1 { - {D3D12::EmbeddedShaders::k_display_ps_d0i1c0m01, - D3D12::EmbeddedShaders::k_display_ps_d0i1c0m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i1c0m02, - D3D12::EmbeddedShaders::k_display_ps_d0i1c0m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i1c0m04, - D3D12::EmbeddedShaders::k_display_ps_d0i1c0m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i1c0m08, - D3D12::EmbeddedShaders::k_display_ps_d0i1c0m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i1c0m16, - D3D12::EmbeddedShaders::k_display_ps_d0i1c0m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i1c0m32, - D3D12::EmbeddedShaders::k_display_ps_d0i1c0m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m01, + D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m02, + D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m04, + D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m08, + D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m16, + D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m32, + D3DCommon::EmbeddedShaders::k_display_ps_d0i1c0m32_size_bytes}, }, // interlace_mode = 2 { - {D3D12::EmbeddedShaders::k_display_ps_d0i2c0m01, - D3D12::EmbeddedShaders::k_display_ps_d0i2c0m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i2c0m02, - D3D12::EmbeddedShaders::k_display_ps_d0i2c0m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i2c0m04, - D3D12::EmbeddedShaders::k_display_ps_d0i2c0m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i2c0m08, - D3D12::EmbeddedShaders::k_display_ps_d0i2c0m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i2c0m16, - D3D12::EmbeddedShaders::k_display_ps_d0i2c0m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d0i2c0m32, - D3D12::EmbeddedShaders::k_display_ps_d0i2c0m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m01, + D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m02, + D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m04, + D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m08, + D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m16, + D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m32, + D3DCommon::EmbeddedShaders::k_display_ps_d0i2c0m32_size_bytes}, }, }; @@ -2378,99 +2378,99 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetDisplayPipeline(uint8 { // smooth_chroma = 0 { - {D3D12::EmbeddedShaders::k_display_ps_d1i0c0m01, - D3D12::EmbeddedShaders::k_display_ps_d1i0c0m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c0m02, - D3D12::EmbeddedShaders::k_display_ps_d1i0c0m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c0m04, - D3D12::EmbeddedShaders::k_display_ps_d1i0c0m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c0m08, - D3D12::EmbeddedShaders::k_display_ps_d1i0c0m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c0m16, - D3D12::EmbeddedShaders::k_display_ps_d1i0c0m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c0m32, - D3D12::EmbeddedShaders::k_display_ps_d1i0c0m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m01, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m02, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m04, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m08, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m16, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m32, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c0m32_size_bytes}, }, // smooth_chroma = 1 { - {D3D12::EmbeddedShaders::k_display_ps_d1i0c1m01, - D3D12::EmbeddedShaders::k_display_ps_d1i0c1m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c1m02, - D3D12::EmbeddedShaders::k_display_ps_d1i0c1m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c1m04, - D3D12::EmbeddedShaders::k_display_ps_d1i0c1m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c1m08, - D3D12::EmbeddedShaders::k_display_ps_d1i0c1m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c1m16, - D3D12::EmbeddedShaders::k_display_ps_d1i0c1m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i0c1m32, - D3D12::EmbeddedShaders::k_display_ps_d1i0c1m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m01, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m02, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m04, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m08, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m16, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m32, + D3DCommon::EmbeddedShaders::k_display_ps_d1i0c1m32_size_bytes}, }, }, // interlace_mode = 1 { // smooth_chroma = 0 { - {D3D12::EmbeddedShaders::k_display_ps_d1i1c0m01, - D3D12::EmbeddedShaders::k_display_ps_d1i1c0m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c0m02, - D3D12::EmbeddedShaders::k_display_ps_d1i1c0m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c0m04, - D3D12::EmbeddedShaders::k_display_ps_d1i1c0m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c0m08, - D3D12::EmbeddedShaders::k_display_ps_d1i1c0m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c0m16, - D3D12::EmbeddedShaders::k_display_ps_d1i1c0m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c0m32, - D3D12::EmbeddedShaders::k_display_ps_d1i1c0m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m01, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m02, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m04, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m08, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m16, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m32, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c0m32_size_bytes}, }, // smooth_chroma = 1 { - {D3D12::EmbeddedShaders::k_display_ps_d1i1c1m01, - D3D12::EmbeddedShaders::k_display_ps_d1i1c1m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c1m02, - D3D12::EmbeddedShaders::k_display_ps_d1i1c1m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c1m04, - D3D12::EmbeddedShaders::k_display_ps_d1i1c1m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c1m08, - D3D12::EmbeddedShaders::k_display_ps_d1i1c1m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c1m16, - D3D12::EmbeddedShaders::k_display_ps_d1i1c1m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i1c1m32, - D3D12::EmbeddedShaders::k_display_ps_d1i1c1m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m01, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m02, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m04, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m08, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m16, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m32, + D3DCommon::EmbeddedShaders::k_display_ps_d1i1c1m32_size_bytes}, }, }, // interlace_mode = 2 { // smooth_chroma = 0 { - {D3D12::EmbeddedShaders::k_display_ps_d1i2c0m01, - D3D12::EmbeddedShaders::k_display_ps_d1i2c0m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c0m02, - D3D12::EmbeddedShaders::k_display_ps_d1i2c0m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c0m04, - D3D12::EmbeddedShaders::k_display_ps_d1i2c0m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c0m08, - D3D12::EmbeddedShaders::k_display_ps_d1i2c0m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c0m16, - D3D12::EmbeddedShaders::k_display_ps_d1i2c0m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c0m32, - D3D12::EmbeddedShaders::k_display_ps_d1i2c0m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m01, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m02, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m04, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m08, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m16, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m32, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c0m32_size_bytes}, }, // smooth_chroma = 1 { - {D3D12::EmbeddedShaders::k_display_ps_d1i2c1m01, - D3D12::EmbeddedShaders::k_display_ps_d1i2c1m01_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c1m02, - D3D12::EmbeddedShaders::k_display_ps_d1i2c1m02_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c1m04, - D3D12::EmbeddedShaders::k_display_ps_d1i2c1m04_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c1m08, - D3D12::EmbeddedShaders::k_display_ps_d1i2c1m08_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c1m16, - D3D12::EmbeddedShaders::k_display_ps_d1i2c1m16_size_bytes}, - {D3D12::EmbeddedShaders::k_display_ps_d1i2c1m32, - D3D12::EmbeddedShaders::k_display_ps_d1i2c1m32_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m01, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m01_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m02, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m02_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m04, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m04_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m08, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m08_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m16, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m16_size_bytes}, + {D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m32, + D3DCommon::EmbeddedShaders::k_display_ps_d1i2c1m32_size_bytes}, }, }, }; @@ -2532,8 +2532,8 @@ GPU_HW_D3D12::ComPtr GPU_HW_D3D12::GetCopyPipeline() // no shader_cache lookup, no D3DCompile, no m_shadergen // dependency. The PSO compile below is the only remaining work. const D3D12_SHADER_BYTECODE fs = { - D3D12::EmbeddedShaders::k_copy_ps, - D3D12::EmbeddedShaders::k_copy_ps_size_bytes, + D3DCommon::EmbeddedShaders::k_copy_ps, + D3DCommon::EmbeddedShaders::k_copy_ps_size_bytes, }; D3D12::GraphicsPipelineBuilder gpbuilder; diff --git a/tools/regen_d3d12_dxbc.py b/tools/regen_d3d12_dxbc.py index 0dac4d8a..735c3a27 100755 --- a/tools/regen_d3d12_dxbc.py +++ b/tools/regen_d3d12_dxbc.py @@ -1,10 +1,18 @@ #!/usr/bin/env python3 -# Regenerate embedded D3D12 DXBC blobs from HLSL sources. +# Regenerate embedded DXBC blobs from HLSL sources. # # This script is NOT invoked by the core build. It is run by contributors who # edit shader sources under data/shaders/d3d12/. The build itself only sees -# the resulting .inc files (checked into src/common/d3d12/embedded_dxbc/), so -# the libretro core has zero fxc.exe / D3DCompile dependency at build time. +# the resulting .inc files (checked into src/common/d3d_common/embedded_dxbc/), +# so the libretro core has zero fxc.exe / D3DCompile dependency at build time. +# +# The .inc files are shared between the D3D11 and D3D12 backends - DXBC at +# ps_5_0 / vs_5_0 etc. is consumed identically by both, and the shadergen +# emits identical HLSL across the API_D3D11 / API_D3D12 macros (the macros +# exist but no batch FS body references them). The HLSL sources live under +# data/shaders/d3d12/ for historical naming reasons; the script name keeps +# the "d3d12" tag for the same reason. Both could be renamed to d3d_common +# in a future cleanup with no behavioural impact. # # Mirror of tools/regen_vulkan_spirv.py for the Vulkan backend. The same # editing workflow applies: edit .hlsl source -> rerun this script -> commit @@ -30,7 +38,7 @@ from pathlib import Path REPO_ROOT = Path(__file__).resolve().parent.parent HLSL_DIR = REPO_ROOT / "data" / "shaders" / "d3d12" -INC_DIR = REPO_ROOT / "src" / "common" / "d3d12" / "embedded_dxbc" +INC_DIR = REPO_ROOT / "src" / "common" / "d3d_common" / "embedded_dxbc" # Map HLSL filename suffix to (fxc target prefix, identifier suffix). The # first element is what we pass to fxc /T (e.g. "ps_5_0"); the second is the @@ -47,7 +55,7 @@ STAGE_FROM_SUFFIX = { # Templates: shader sources that produce more than one .inc output, each # with a different combination of /D preprocessor defines. Index ordering -# here MUST match the helper in src/common/d3d12/embedded_shaders.cpp that +# here MUST match the helper in src/common/d3d_common/embedded_shaders.cpp that # picks the right blob at runtime - if you add a variant here, add the # matching entry there too. # @@ -571,7 +579,7 @@ def emit_inc(identifier, hlsl_name, target, defines, data, out_path): f"// DO NOT EDIT. Regenerate with tools/regen_d3d12_dxbc.py.\n" f"// fxc /T {target} /E main /O3 {define_summary}\n" f"//\n" - f"// Included inside namespace D3D12::EmbeddedShaders in\n" + f"// Included inside namespace D3DCommon::EmbeddedShaders in\n" f"// embedded_shaders.cpp. The matching extern declaration lives in\n" f"// embedded_shaders.h.\n" f"\n"