From 7594c0c29d8f81c74d3e181e0197cf31c492a42e Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 10 Dec 2014 18:22:28 +0100 Subject: canvas: DIRECTX_VERSION macro is obsolete It was only checked by our own code, and only DirectX 9 is supported. Change-Id: I03035f87969301624df011cb4d76c6a9532f3c99 --- canvas/source/directx/dx_9rm.cxx | 4 ---- canvas/source/directx/dx_winstuff.hxx | 4 ---- 2 files changed, 8 deletions(-) (limited to 'canvas/source') diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx index f679bd1a7676..e9fd6664bd6f 100644 --- a/canvas/source/directx/dx_9rm.cxx +++ b/canvas/source/directx/dx_9rm.cxx @@ -18,8 +18,6 @@ */ -#if DIRECTX_VERSION == 0x0900 - #define MAX_TEXTURE_SIZE (2048) #define MIN_TEXTURE_SIZE (32) //#define FAKE_MAX_NUMBER_TEXTURES (2) @@ -1342,6 +1340,4 @@ namespace dxcanvas } } -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx index b7c9d8e3f74d..7b7f3c2c05bf 100644 --- a/canvas/source/directx/dx_winstuff.hxx +++ b/canvas/source/directx/dx_winstuff.hxx @@ -38,10 +38,6 @@ # define D3D_DEBUG_INFO #endif -#ifndef DIRECTX_VERSION -#error please define for which directx version we should compile -#endif - #if defined _MSC_VER #pragma warning(push,1) #endif -- cgit v1.2.3