Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-15 11:48:33 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Provide more info to thin3d d3d init

Browse Source
This commit is contained in:
Henrik Rydgard 2014-08-23 10:20:57 +02:00
parent 0f973a3276
commit 7f4758baae
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Windows/D3D9Base.cpp
View File

@ -14,6 +14,7 @@
#include "thin3d/d3dx9_loader.h"
static LPDIRECT3D9 d3d;
static int adapterId;
static LPDIRECT3DDEVICE9 device;
static HDC hDC; // Private GDI Device Context
static HGLRC hRC; // Permanent Rendering Context
@ -31,7 +32,7 @@ void D3D9_SwapBuffers() {
}
Thin3DContext *D3D9_CreateThin3DContext() {
return T3DCreateDX9Context(device);
return T3DCreateDX9Context(d3d, adapterId, device);
}
bool D3D9_Init(HWND hWnd, bool windowed, std::string *error_message) {
@ -54,8 +55,8 @@ bool D3D9_Init(HWND hWnd, bool windowed, std::string *error_message) {
return false;
}
int adapter = D3DADAPTER_DEFAULT;
if (FAILED(d3d->GetDeviceCaps(adapter, D3DDEVTYPE_HAL, &d3dCaps))) {
adapterId = D3DADAPTER_DEFAULT;
if (FAILED(d3d->GetDeviceCaps(adapterId, D3DDEVTYPE_HAL, &d3dCaps))) {
d3d->Release();
return false;
}
@ -90,9 +91,9 @@ bool D3D9_Init(HWND hWnd, bool windowed, std::string *error_message) {
pp.hDeviceWindow = hWnd;
pp.EnableAutoDepthStencil = true;
pp.AutoDepthStencilFormat = D3DFMT_D24S8;
pp.PresentationInterval = (g_Config.bVSync) ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
pp.PresentationInterval = (g_Config.bVSync) ? D3DPRESENT_INTERVAL_ONE : D3DPRESENT_INTERVAL_IMMEDIATE;
hr = d3d->CreateDevice(adapter, D3DDEVTYPE_HAL, hWnd, dwBehaviorFlags, &pp, &device);
hr = d3d->CreateDevice(adapterId, D3DDEVTYPE_HAL, hWnd, dwBehaviorFlags, &pp, &device);
if (FAILED(hr)) {
ELOG("Failed to create D3D device");
d3d->Release();

2
native

@ -1 +1 @@
Subproject commit 7708558c2f247dd4e8d874df9a05c414c3739bc8
Subproject commit 6f96004381895365cfe0d748bd8c8805aa472a0a