From 8d70fd269e86c79dcece61e38c9e60740da290d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Fri, 30 Oct 2020 23:58:53 +0100 Subject: [PATCH] Minor D3D9 fixes --- Common/GPU/D3D9/D3D9ShaderCompiler.cpp | 6 ++++++ GPU/D3D11/FramebufferManagerD3D11.cpp | 2 +- GPU/Directx9/FramebufferManagerDX9.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Common/GPU/D3D9/D3D9ShaderCompiler.cpp b/Common/GPU/D3D9/D3D9ShaderCompiler.cpp index 8240dc7587..0a458597ca 100644 --- a/Common/GPU/D3D9/D3D9ShaderCompiler.cpp +++ b/Common/GPU/D3D9/D3D9ShaderCompiler.cpp @@ -7,6 +7,8 @@ #include "Common/GPU/D3D9/D3D9ShaderCompiler.h" #include "Common/CommonFuncs.h" #include "Common/SysError.h" +#include "Common/Log.h" +#include "Common/StringUtils.h" struct ID3DXConstantTable; @@ -29,6 +31,10 @@ LPD3DBLOB CompileShaderToByteCodeD3D9(const char *code, const char *target, std: if (pErrorMsg) { *errorMessage = (CHAR *)pErrorMsg->GetBufferPointer(); + + OutputDebugStringUTF8(LineNumberString(std::string(code)).c_str()); + OutputDebugStringUTF8(errorMessage->c_str()); + pErrorMsg->Release(); } else if (FAILED(hr)) { *errorMessage = GetStringErrorMsg(hr); diff --git a/GPU/D3D11/FramebufferManagerD3D11.cpp b/GPU/D3D11/FramebufferManagerD3D11.cpp index 437fe4922c..92734d5be6 100644 --- a/GPU/D3D11/FramebufferManagerD3D11.cpp +++ b/GPU/D3D11/FramebufferManagerD3D11.cpp @@ -51,7 +51,7 @@ static const char *vscode = "struct VS_IN {\n" " float4 ObjPos : POSITION;\n" " float2 Uv : TEXCOORD0;\n" - "};" + "};\n" "struct VS_OUT {\n" " float2 Uv : TEXCOORD0;\n" " float4 ProjPos : SV_Position;\n" diff --git a/GPU/Directx9/FramebufferManagerDX9.cpp b/GPU/Directx9/FramebufferManagerDX9.cpp index 3bbecb90b3..be182d77f1 100644 --- a/GPU/Directx9/FramebufferManagerDX9.cpp +++ b/GPU/Directx9/FramebufferManagerDX9.cpp @@ -52,7 +52,7 @@ static const char *vscode = R"( struct VS_IN { float4 ObjPos : POSITION; float2 Uv : TEXCOORD0; -};" +}; struct VS_OUT { float4 ProjPos : POSITION; float2 Uv : TEXCOORD0;