mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-25 12:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Move more defines/header includes to d3d_defines.h

Browse Source
This commit is contained in:
twinaphex 2014-01-01 03:15:48 +01:00
parent d4a9cc3d8c
commit a6df90ff71
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/d3d9/d3d9.hpp
View File

@ -23,10 +23,6 @@
#include "../gfx_common.h"
#include <d3d9.h>
#include <d3dx9.h>
#include <d3dx9core.h>
#ifdef HAVE_CG
#include <Cg/cg.h>
#include <Cg/cgD3D9.h>

2
gfx/d3d9/d3d9_pc.cpp
View File

@ -147,7 +147,7 @@ int D3DVideo::init_base(const video_info_t *info)
D3DPRESENT_PARAMETERS d3dpp;
make_d3dpp(info, &d3dpp);
g_pD3D = Direct3DCreate9(D3D_SDK_VERSION);
g_pD3D = D3DCREATE_CTX(D3D_SDK_VERSION);
if (!g_pD3D)
{
RARCH_ERR("Failed to create D3D9 interface!\n");

22
gfx/d3d9/d3d_defines.h
View File

@ -17,6 +17,12 @@
#ifndef D3DVIDEO_DEFINES_H
#define D3DVIDEO_DEFINES_H
#if defined(HAVE_WIN32_D3D9) || defined(_XBOX360)
//Direct3D 9
#include <d3d9.h>
#include <d3dx9.h>
#include <d3dx9core.h>
#define LPDIRECT3D LPDIRECT3D9
#define LPDIRECT3DDEVICE LPDIRECT3DDEVICE9
#define LPDIRECT3DTEXTURE LPDIRECT3DTEXTURE9
@ -28,4 +34,20 @@
#define D3DVERTEXELEMENT D3DVERTEXELEMENT9
#define D3DVIEWPORT D3DVIEWPORT9
#define D3DCREATE_CTX Direct3DCreate9
#elif defined(_XBOX1)
//Direct3D 8
#define LPDIRECT3D LPDIRECT3D8
#define LPDIRECT3DDEVICE LPDIRECT3DDEVICE8
#define LPDIRECT3DTEXTURE LPDIRECT3DTEXTURE8
#define LPDIRECT3DVERTEXBUFFER LPDIRECT3DVERTEXBUFFER8
#define LPDIRECT3DVERTEXSHADER LPDIRECT3DVERTEXSHADER8
#define LPDIRECT3DPIXELSHADER LPDIRECT3DPIXELSHADER8
#define LPDIRECT3DSURFACE LPDIRECT3DSURFACE8
#define D3DVERTEXELEMENT D3DVERTEXELEMENT8
#define D3DVIEWPORT D3DVIEWPORT8
#define D3DCREATE_CTX Direct3DCreate8
#endif
#endif