diff options
| author | Jason Maskell <[email protected]> | 2016-05-25 16:02:23 +0200 |
|---|---|---|
| committer | Jason Maskell <[email protected]> | 2016-05-25 16:02:23 +0200 |
| commit | 69f624cfc22c361a8162f57df4a71e4324805717 (patch) | |
| tree | 245e0e5ebcb120fc573eb44d82755c1456e0d519 /src/Internal.h | |
| parent | Added OpenGL sample - compiles and runs but doesn't work. (diff) | |
| download | waveworks_archive-69f624cfc22c361a8162f57df4a71e4324805717.tar.xz waveworks_archive-69f624cfc22c361a8162f57df4a71e4324805717.zip | |
Excised D3D9 and 10 support from library.
Diffstat (limited to 'src/Internal.h')
| -rw-r--r-- | src/Internal.h | 37 |
1 files changed, 1 insertions, 36 deletions
diff --git a/src/Internal.h b/src/Internal.h index a2746e8..a7a73e7 100644 --- a/src/Internal.h +++ b/src/Internal.h @@ -174,7 +174,6 @@ #else // TARGET_PLATFORM_XBONE #include <dxgi.h> #include <d3d11.h> -#include <d3d9.h> // Check we're building against a recent-enough WinSDK #include <winsdkver.h> @@ -402,18 +401,6 @@ void handle_hr_error(HRESULT hr, const char_type* file, int line); #define WAVEWORKS_ALLOW_GFX 1 #endif -#if D3D_SDK_VERSION -#define WAVEWORKS_ENABLE_D3D9 WAVEWORKS_ALLOW_GFX -#else -#define WAVEWORKS_ENABLE_D3D9 0 -#endif - -#ifdef D3D10_SDK_VERSION -#define WAVEWORKS_ENABLE_D3D10 WAVEWORKS_ALLOW_GFX -#else -#define WAVEWORKS_ENABLE_D3D10 0 -#endif - #ifdef D3D11_SDK_VERSION #define WAVEWORKS_ENABLE_D3D11 WAVEWORKS_ALLOW_GFX #else @@ -440,7 +427,7 @@ void handle_hr_error(HRESULT hr, const char_type* file, int line); #endif #endif -#define WAVEWORKS_ENABLE_GRAPHICS (WAVEWORKS_ENABLE_D3D9 || WAVEWORKS_ENABLE_D3D10 || WAVEWORKS_ENABLE_D3D11 || WAVEWORKS_ENABLE_GNM || WAVEWORKS_ENABLE_GL) +#define WAVEWORKS_ENABLE_GRAPHICS (WAVEWORKS_ENABLE_D3D11 || WAVEWORKS_ENABLE_GNM || WAVEWORKS_ENABLE_GL) #ifndef SUPPORT_CUDA typedef struct @@ -467,14 +454,6 @@ void handle_hr_error(HRESULT hr, const char_type* file, int line); #pragma warning( pop ) - #if WAVEWORKS_ENABLE_D3D9 - #include <cuda_d3d9_interop.h> - #endif - - #if WAVEWORKS_ENABLE_D3D10 - #include <cuda_d3d10_interop.h> - #endif - #if WAVEWORKS_ENABLE_D3D11 #include <cuda_d3d11_interop.h> #endif @@ -568,8 +547,6 @@ enum nv_water_d3d_api { nv_water_d3d_api_undefined = 0, nv_water_d3d_api_none, // Meaning: initialise and run without graphics e.g. server-mode - nv_water_d3d_api_d3d9, - nv_water_d3d_api_d3d10, nv_water_d3d_api_d3d11, nv_water_d3d_api_gnm, nv_water_d3d_api_gl2 @@ -779,18 +756,6 @@ extern GFSDK_WAVEWORKS_GLFunctions NVSDK_GLFunctions; #define GL_MAP_UNSYNCHRONIZED_BIT 0x0020 -#if WAVEWORKS_ENABLE_D3D9 -#define D3D9_ONLY(x) x -#else -#define D3D9_ONLY(x) -#endif - -#if WAVEWORKS_ENABLE_D3D10 -#define D3D10_ONLY(x) x -#else -#define D3D10_ONLY(x) -#endif - #if WAVEWORKS_ENABLE_D3D11 #define D3D11_ONLY(x) x #else |