Merged PR 4182306: [Git2Git] Merged PR 4182266: conhost: don't use D3DCompiler on inside-windows builds (and delete the shaders)

[Git2Git] Merged PR 4182266: conhost: don't use D3DCompiler on inside-windows builds (and delete the shaders)

Related work items: #24424432, #24424534, #24543695 Retrieved from https://microsoft.visualstudio.com os OS official/rs_onecore_dep_uxp b5d1859452a94e446a3be3f97eb638e13e26496e

Related work items: #24424432, #24424534, #24543695

src/host/sources.inc

@@ -149,7 +149,6 @@ TARGETLIBS = \
     $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dwrite.lib \
     $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\dxgi.lib \
     $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3d11.lib \
-    $(ONECOREUAP_EXTERNAL_SDK_LIB_PATH)\d3dcompiler.lib \
     $(MODERNCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\api-ms-win-mm-playsound-l1.lib \
     $(ONECORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-dwmapi-ext-l1.lib \
     $(MINCORE_INTERNAL_PRIV_SDK_LIB_VPATH_L)\ext-ms-win-edputil-policy-l1.lib \

src/renderer/dx/DxRenderer.cpp

@@ -162,6 +162,10 @@ _CompileShader(
     std::string target,
     std::string entry = "main")
 {
+#ifdef __INSIDE_WINDOWS
+    THROW_HR(E_UNEXPECTED);
+    return 0;
+#else
     Microsoft::WRL::ComPtr<ID3DBlob> code{};
     Microsoft::WRL::ComPtr<ID3DBlob> error{};
 
@@ -190,6 +194,7 @@ _CompileShader(
     }
 
     return code;
+#endif
 }
 
 // Routine Description:

src/renderer/dx/ScreenPixelShader.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#ifdef __INSIDE_WINDOWS
+const char screenPixelShaderString[] = "";
+#else
 const char screenPixelShaderString[] = R"(
 Texture2D shaderTexture;
 SamplerState samplerState;
@@ -77,3 +80,4 @@ float4 main(float4 pos : SV_POSITION, float2 tex : TEXCOORD) : SV_TARGET
     return color;
 }
 )";
+#endif

src/renderer/dx/ScreenVertexShader.h

@@ -1,5 +1,8 @@
 #pragma once
 
+#ifdef __INSIDE_WINDOWS
+const char screenVertexShaderString[] = "";
+#else
 const char screenVertexShaderString[] = R"(
 struct VS_OUTPUT
 {
@@ -14,3 +17,4 @@ VS_OUTPUT main(float4 pos : POSITION, float2 tex : TEXCOORD)
     return output;
 }
 )";
+#endif

src/renderer/dx/sources.inc

@@ -35,3 +35,5 @@ SOURCES = \
     ..\DxRenderer.cpp \
     ..\CustomTextRenderer.cpp \
     ..\CustomTextLayout.cpp \
+
+C_DEFINES=$(C_DEFINES) -D__INSIDE_WINDOWS