Commit MetaInfo

Revisionff5f400105e15b1e852229d65f244b9a9f14b8b8 (tree)
Time2011-10-28 06:14:55
AuthorFace
CommiterFace

Log Message

D3D11Client: starting DX9 to DX11 with D3D11Client.h

Change Summary

Incremental Difference

diff -r 8d47d0e7a5ea -r ff5f400105e1 Orbitersdk/D3D11Client/D3D11Client.h
--- a/Orbitersdk/D3D11Client/D3D11Client.h Thu Oct 27 23:14:30 2011 +0200
+++ b/Orbitersdk/D3D11Client/D3D11Client.h Thu Oct 27 23:14:55 2011 +0200
@@ -10,8 +10,6 @@
1010 #include <fstream.h>
1111 #endif
1212
13-#include <d3d9.h>
14-#include <d3dx9.h>
1513 #include "GraphicsAPI.h"
1614 #include "OGCI.h"
1715 #include "D3D11util.h"
@@ -23,7 +21,7 @@
2321 class Scene;
2422 class VideoTab;
2523 class D3D11ClientSurface;
26-class CD3DFramework9;
24+class CD3DFramework11;
2725 class D3D11Mesh;
2826 class D3D11Annotation;
2927 class D3D11Text;
@@ -70,7 +68,7 @@
7068 friend class ::MeshManager;
7169 friend class ::TextureManager;
7270 friend class ::D3D11ClientSurface;
73- friend class ::CD3DFramework9;
71+ friend class ::CD3DFramework11;
7472
7573 public:
7674 D3D11Client (HINSTANCE hInstance);
@@ -247,14 +245,11 @@
247245 /// Returns the configuration manager
248246 inline const D3D11Config *Cfg() const { return cfg; }
249247
250- /// Returns the Direct3D object
251- inline const LPDIRECT3D9 GetDirect3D9() const { return pD3D; }
252-
253248 /// Returns the Direct3D device
254- inline const LPDIRECT3DDEVICE9 GetDevice() const { return pd3dDevice; }
249+ inline const ID3D11Device* GetDevice() const { return pd3dDevice; }
255250
256251 /// Returns a pointer to the render framework
257- inline const CD3DFramework9* GetFramework() const { return pFramework; }
252+ inline const CD3DFramework11* GetFramework() const { return pFramework; }
258253
259254 /// Returns a pointer to the scene object
260255 inline Scene* GetScene() const { return scene; }
@@ -488,7 +483,6 @@
488483 const LPD3DXMATRIX GetIdentity() const { return (const LPD3DXMATRIX)&ident; }
489484
490485 HWND GetWindow();
491- D3DCAPS9 *GetHardwareCaps() { return &caps; }
492486 D3D11Stat *GetStats() { return &stats; }
493487
494488 protected:
@@ -590,17 +584,15 @@
590584 void CheckBltGroup(SURFHANDLE src) const;
591585 void LogRenderParams () const;
592586
593- LPDIRECT3D9 pD3D;
594- LPDIRECT3DDEVICE9 pd3dDevice;
587+ ID3D11Device *pd3dDevice;
595588 LPD3D11CLIENTSURFACE pDefaultTex;
596589 LPD3D11CLIENTSURFACE pScatterTest;
597590
598- LPDIRECT3DSURFACE9 pSplashScreen;
599- LPDIRECT3DSURFACE9 pTextScreen;
600- LPDIRECT3DSURFACE9 pBackBuffer;
591+ ID3D11Texture2D *pSplashScreen;
592+ ID3D11Texture2D *pTextScreen;
593+ ID3D11Texture2D *pBackBuffer;
601594
602- CD3DFramework9* pFramework;
603- D3DCAPS9 caps;
595+ CD3DFramework11* pFramework;
604596 D3D11Stat stats;
605597
606598 HWND hRenderWnd; // render window handle
Show on old repository browser