TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

consolidate dx8 includes

Browse Source
This commit is contained in:
David Rose 2006-01-29 16:01:07 +00:00
parent b36d67f3b9
commit 28a500430f
5 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/dxgsg8/dxGraphicsStateGuardian8.cxx
View File

@ -60,8 +60,8 @@
#include "dxIndexBufferContext8.h" #include "dxIndexBufferContext8.h"
#include "pStatTimer.h" #include "pStatTimer.h"
#include "pStatCollector.h" #include "pStatCollector.h"
#include "dxgsg8base.h"
#include <d3dx8.h>
#include <mmsystem.h> #include <mmsystem.h>
TypeHandle DXGraphicsStateGuardian8::_type_handle; TypeHandle DXGraphicsStateGuardian8::_type_handle;

2
panda/src/dxgsg8/dxIndexBufferContext8.cxx
View File

@ -21,7 +21,7 @@
#include "config_dxgsg8.h" #include "config_dxgsg8.h"
#include "graphicsStateGuardian.h" #include "graphicsStateGuardian.h"
#include "pStatTimer.h" #include "pStatTimer.h"
#include <d3dx8.h> #include "dxgsg8base.h"
TypeHandle DXIndexBufferContext8::_type_handle; TypeHandle DXIndexBufferContext8::_type_handle;

3
panda/src/dxgsg8/dxTextureContext8.cxx
View File

@ -20,7 +20,8 @@
#include "config_dxgsg8.h" #include "config_dxgsg8.h"
#include "dxGraphicsStateGuardian8.h" #include "dxGraphicsStateGuardian8.h"
#include "pStatTimer.h" #include "pStatTimer.h"
#include <d3dx8tex.h> #include "dxgsg8base.h"
#include <assert.h> #include <assert.h>
#include <time.h> #include <time.h>

2
panda/src/dxgsg8/dxVertexBufferContext8.cxx
View File

@ -23,7 +23,7 @@
#include "pStatTimer.h" #include "pStatTimer.h"
#include "internalName.h" #include "internalName.h"
#include "config_dxgsg8.h" #include "config_dxgsg8.h"
#include <d3dx8.h> #include "dxgsg8base.h"
TypeHandle DXVertexBufferContext8::_type_handle; TypeHandle DXVertexBufferContext8::_type_handle;

16
panda/src/dxgsg8/dxgsg8base.h
View File

@ -29,26 +29,14 @@
#define STRICT #define STRICT
#endif #endif
#define DIRECT3D_VERSION 0x0800
#include <windows.h> #include <windows.h>
#define D3D_OVERLOADS // get D3DVECTOR '+' operator, etc from d3dtypes.h
#include <d3d8.h> #include <d3d8.h>
#include <d3dx8.h> #include <d3dx8.h>
#include <dxerr8.h> #include <dxerr8.h>
#include <d3dx8tex.h>
#undef WIN32_LEAN_AND_MEAN #undef WIN32_LEAN_AND_MEAN
#if D3D_SDK_VERSION != 220
#error you have DX 8.0 headers, not DX 8.1, you need to install DX 8.1 SDK!
#endif
#if DIRECT3D_VERSION != 0x0800
#error DX8.1 headers not available, you need to install newer MS Platform SDK!
#endif
#ifndef D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD
#error you have pre-release DX8.1 headers, you need to install final DX 8.1 SDK!
#endif
#ifndef D3DERRORSTRING #ifndef D3DERRORSTRING
#ifdef NDEBUG #ifdef NDEBUG
#define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" << DXGetErrorString8(HRESULT) << endl // leave out descriptions to shrink release build #define D3DERRORSTRING(HRESULT) " at (" << __FILE__ << ":" << __LINE__ << "), hr=" << DXGetErrorString8(HRESULT) << endl // leave out descriptions to shrink release build