RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 18:53:28 +01:00
Code Issues Releases Wiki Activity

Compilation fix

Browse Source
This commit is contained in:
Nekotekina 2015-11-01 13:43:30 +03:00
parent a4db58f5f2
commit 080e503954
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
View File

@ -1,6 +1,5 @@
#include "stdafx_d3d12.h" #include "stdafx_d3d12.h"
#ifdef _WIN32 #ifdef _WIN32
#include <d3dcompiler.h>
#include "D3D12GSRender.h" #include "D3D12GSRender.h"
#include <wrl/client.h> #include <wrl/client.h>
#include <dxgi1_4.h> #include <dxgi1_4.h>
@ -10,9 +9,6 @@
#include <d3d11on12.h> #include <d3d11on12.h>
#include "Emu/state.h" #include "Emu/state.h"
#include "D3D12Formats.h" #include "D3D12Formats.h"
#pragma comment(lib, "d2d1")
#pragma comment(lib, "DXGI")
#pragma comment(lib, "Dwrite")
PFN_D3D12_CREATE_DEVICE wrapD3D12CreateDevice; PFN_D3D12_CREATE_DEVICE wrapD3D12CreateDevice;
PFN_D3D12_GET_DEBUG_INTERFACE wrapD3D12GetDebugInterface; PFN_D3D12_GET_DEBUG_INTERFACE wrapD3D12GetDebugInterface;

3
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
View File

@ -1,13 +1,10 @@
#include "stdafx_d3d12.h" #include "stdafx_d3d12.h"
#ifdef _WIN32 #ifdef _WIN32
#include <d3dcompiler.h>
#include "D3D12PipelineState.h" #include "D3D12PipelineState.h"
#include "D3D12GSRender.h" #include "D3D12GSRender.h"
#include "Emu/state.h" #include "Emu/state.h"
#include "D3D12Formats.h" #include "D3D12Formats.h"
#pragma comment (lib, "d3dcompiler.lib")
#define TO_STRING(x) #x #define TO_STRING(x) #x
void Shader::Compile(const std::string &code, SHADER_TYPE st) void Shader::Compile(const std::string &code, SHADER_TYPE st)

1
rpcs3/Emu/RSX/D3D12/D3D12Utils.cpp
View File

@ -3,7 +3,6 @@
*/ */
#include "stdafx_d3d12.h" #include "stdafx_d3d12.h"
#ifdef _WIN32 #ifdef _WIN32
#include <d3dcompiler.h>
#include "D3D12GSRender.h" #include "D3D12GSRender.h"
#include "d3dx12.h" #include "d3dx12.h"
#include "Utilities/Log.h" #include "Utilities/Log.h"

4
rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
View File

@ -504,8 +504,7 @@ s32 cellGcmSetPrepareFlip(PPUThread& ppu, vm::ptr<CellGcmContextData> ctxt, u32
return res; return res;
} }
} }
#ifdef __GNUC__ #if 1
//gcc internal compiler error, try to avoid it for now
*ctxt->current++ = (GCM_FLIP_COMMAND << 2) | (1 << 18); *ctxt->current++ = (GCM_FLIP_COMMAND << 2) | (1 << 18);
*ctxt->current++ = id; *ctxt->current++ = id;
@ -514,6 +513,7 @@ s32 cellGcmSetPrepareFlip(PPUThread& ppu, vm::ptr<CellGcmContextData> ctxt, u32
vm::_ref<CellGcmControl>(gcm_info.control_addr).put += 2 * sizeof(u32); vm::_ref<CellGcmControl>(gcm_info.control_addr).put += 2 * sizeof(u32);
} }
#else #else
// internal compiler error, try to avoid it for now
u32 command_size = rsx::make_command(ctxt->current, GCM_FLIP_COMMAND, id); u32 command_size = rsx::make_command(ctxt->current, GCM_FLIP_COMMAND, id);
if (ctxt.addr() == gcm_info.context_addr) if (ctxt.addr() == gcm_info.context_addr)

5
rpcs3/stdafx_d3d12.cpp
View File

@ -1 +1,6 @@
#include "stdafx_d3d12.h" #include "stdafx_d3d12.h"
#pragma comment(lib, "d2d1")
#pragma comment(lib, "DXGI")
#pragma comment(lib, "Dwrite")
#pragma comment(lib, "d3dcompiler.lib")

3
rpcs3/stdafx_d3d12.h
View File

@ -2,6 +2,9 @@
#include "stdafx.h" #include "stdafx.h"
#ifdef _WIN32 #ifdef _WIN32
// Must be included first
#include <d3dcompiler.h>
#include <d3d12.h> #include <d3d12.h>
#include "Emu\RSX\D3D12\D3D12Utils.h" #include "Emu\RSX\D3D12\D3D12Utils.h"
#include "Emu\RSX\D3D12\D3D12Formats.h" #include "Emu\RSX\D3D12\D3D12Formats.h"