Support for Direct3D 8 removed.

Missing people with interest in maintaining it. Anyone who still needs DX8 can branch the previous svn version or use Irrlicht 1.8.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5053 dfc29bdd-3216-0410-991c-e03cc46cb475

changes.txt

 --------------------------
 Changes in 1.9 (not yet released)
 
+- Support for Direct3D 8 removed after svn revision 5052 due to lack of maintenance.
 - _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX removed. This was a bugfix for VS2003 (in combination with .NET) which we haven't supported in a while.
-- VS 2005 support removed in svn revision 5048. 
-- WinCE 6 supported removed in svn revision 5046. 
-- NVidia CG support removed in svn revision 5045 due to lack of maintenance. NVidia has also stopped supporting this.
+- VS 2005 support removed after svn revision 5048. 
+- WinCE 6 supported removed after svn revision 5046. 
+- NVidia CG support removed after svn revision 5045 due to lack of maintenance. NVidia has also stopped supporting this.
 - TA burningvideo:
  enabled triangle fan again so that skybox works.[need more testmeshes if other trianglefan than skybox doesn't work]
  correct vc2013 project files for x64,static lib

examples/01.HelloWorld/main.cpp

@@ -95,10 +95,9 @@ int main()
 	parameters:
 
 	- deviceType: Type of the device. This can currently be the Null-device,
-	   one of the two software renderers, D3D8, D3D9, or OpenGL. In this
+	   one of the two software renderers, D3D9, or OpenGL. In this
 	   example we use EDT_SOFTWARE, but to try out, you might want to
-	   change it to EDT_BURNINGSVIDEO, EDT_NULL, EDT_DIRECT3D8,
-	   EDT_DIRECT3D9, or EDT_OPENGL.
+	   change it to EDT_BURNINGSVIDEO, EDT_NULL, EDT_DIRECT3D9, or EDT_OPENGL.
 
 	- windowSize: Size of the Window or screen in FullScreenMode to be
 	   created. In this example we use 640x480.

examples/02.Quake3Map/main.cpp

@@ -57,9 +57,9 @@ int main()
 	video::E_DRIVER_TYPE driverType;
 
 	printf("Please select the driver you want for this example:\n"\
-		" (a) OpenGL 1.5\n (b) Direct3D 9.0c\n (c) Direct3D 8.1\n"\
-		" (d) Burning's Software Renderer\n (e) Software Renderer\n"\
-		" (f) NullDevice\n (otherKey) exit\n\n");
+		" (a) OpenGL 1.5\n (b) Direct3D 9.0c\n"\
+		" (c) Burning's Software Renderer\n (d) Software Renderer\n"\
+		" (e) NullDevice\n (otherKey) exit\n\n");
 
 	char i;
 	std::cin >> i;
@@ -68,10 +68,9 @@ int main()
 	{
 		case 'a': driverType = video::EDT_OPENGL;   break;
 		case 'b': driverType = video::EDT_DIRECT3D9;break;
-		case 'c': driverType = video::EDT_DIRECT3D8;break;
-		case 'd': driverType = video::EDT_BURNINGSVIDEO;break;
-		case 'e': driverType = video::EDT_SOFTWARE; break;
-		case 'f': driverType = video::EDT_NULL;     break;
+		case 'c': driverType = video::EDT_BURNINGSVIDEO;break;
+		case 'd': driverType = video::EDT_SOFTWARE; break;
+		case 'e': driverType = video::EDT_NULL;     break;
 		default: return 1;
 	}
 

examples/10.Shaders/main.cpp

 /** Example 010 Shaders
 
-This tutorial shows how to use shaders for D3D8, D3D9, and OpenGL with the
+This tutorial shows how to use shaders for D3D9, and OpenGL with the
 engine and how to create new material types with them. It also shows how to
 disable the generation of mipmaps at texture loading, and how to use text scene
 nodes.
@@ -187,12 +187,12 @@ int main()
 	Now for the more interesting parts. If we are using Direct3D, we want
 	to load vertex and pixel shader programs, if we have OpenGL, we want to
 	use ARB fragment and vertex programs. I wrote the corresponding
-	programs down into the files d3d8.ps, d3d8.vs, d3d9.ps, d3d9.vs,
-	opengl.ps and opengl.vs. We only need the right filenames now. This is
-	done in the following switch. Note, that it is not necessary to write
-	the shaders into text files, like in this example. You can even write
-	the shaders directly as strings into the cpp source file, and use later
-	addShaderMaterial() instead of addShaderMaterialFromFiles().
+	programs down into the files d3d9.ps, d3d9.vs, opengl.ps and opengl.vs. 
+	We only need the right filenames now. This is done in the following switch. 
+	Note, that it is not necessary to write the shaders into text files, 
+	like in this example. You can even write the shaders directly as strings 
+	into the cpp source file, and use later addShaderMaterial() instead of 
+	addShaderMaterialFromFiles().
 	*/
 
 	io::path vsFileName; // filename for the vertex shader
@@ -200,10 +200,6 @@ int main()
 
 	switch(driverType)
 	{
-	case video::EDT_DIRECT3D8:
-		psFileName = "../../media/d3d8.psh";
-		vsFileName = "../../media/d3d8.vsh";
-		break;
 	case video::EDT_DIRECT3D9:
 		if (UseHighLevelShaders)
 		{

examples/16.Quake3MapShader/main.cpp

@@ -329,7 +329,6 @@ int IRRCALLCONV main(int argc, char* argv[])
 		case video::EDT_OPENGL:
 			gui->addImage(driver->getTexture("opengllogo.png"), pos);
 			break;
-		case video::EDT_DIRECT3D8:
 		case video::EDT_DIRECT3D9:
 			gui->addImage(driver->getTexture("directxlogo.png"), pos);
 			break;

examples/21.Quake3Explorer/main.cpp

@@ -678,7 +678,6 @@ void CQuake3EventHandler::CreateGUI()
 	env->addStaticText ( L"VideoDriver:", rect<s32>( dim.Width - 400, 24, dim.Width - 310, 40 ),false, false, gui.Window, -1, false );
 	gui.VideoDriver = env->addComboBox(rect<s32>( dim.Width - 300, 24, dim.Width - 10, 40 ),gui.Window);
 	gui.VideoDriver->addItem(L"Direct3D 9.0c", EDT_DIRECT3D9 );
-	gui.VideoDriver->addItem(L"Direct3D 8.1", EDT_DIRECT3D8 );
 	gui.VideoDriver->addItem(L"OpenGL 1.5", EDT_OPENGL);
 	gui.VideoDriver->addItem(L"Software Renderer", EDT_SOFTWARE);
 	gui.VideoDriver->addItem(L"Burning's Video (TM) Thomas Alten", EDT_BURNINGSVIDEO);
@@ -1518,11 +1517,8 @@ bool CQuake3EventHandler::OnEvent(const SEvent& eve)
 					rot = cam->getRotation ();
 				}
 
-				static const c8 *dName[] = { "null", "software", "burning",
-					"d3d8", "d3d9", "opengl" };
-
 				snprintf(buf, 256, "%s_%ls_%.0f_%.0f_%.0f_%.0f_%.0f_%.0f.jpg",
-						dName[Game->Device->getVideoDriver()->getDriverType()],
+						DRIVER_TYPE_NAMES_SHORT[Game->Device->getVideoDriver()->getDriverType()],
 						Game->CurrentMapName.c_str(),
 						pos.X, pos.Y, pos.Z,
 						rot.X, rot.Y, rot.Z

examples/Demo/CMainMenu.cpp

@@ -61,7 +61,6 @@ bool CMainMenu::run(bool& outFullscreen, bool& outMusic, bool& outShadows,
 
 	gui::IGUIListBox* box = guienv->addListBox(core::rect<int>(10,10,220,120), optTab, 1);
 	box->addItem(L"OpenGL 1.5");
-	box->addItem(L"Direct3D 8.1");
 	box->addItem(L"Direct3D 9.0c");
 	box->addItem(L"Burning's Video 0.47");
 	box->addItem(L"Irrlicht Software Renderer 1.0");
@@ -253,10 +252,9 @@ bool CMainMenu::run(bool& outFullscreen, bool& outMusic, bool& outShadows,
 	switch(selected)
 	{
 	case 0:	outDriver = video::EDT_OPENGL; break;
-	case 1:	outDriver = video::EDT_DIRECT3D8; break;
-	case 2:	outDriver = video::EDT_DIRECT3D9; break;
-	case 3:	outDriver = video::EDT_BURNINGSVIDEO; break;
-	case 4:	outDriver = video::EDT_SOFTWARE; break;
+	case 1:	outDriver = video::EDT_DIRECT3D9; break;
+	case 2:	outDriver = video::EDT_BURNINGSVIDEO; break;
+	case 3:	outDriver = video::EDT_SOFTWARE; break;
 	}
 
 	return start;

include/EDriverTypes.h

@@ -39,10 +39,8 @@ namespace video
 		contribution. */
 		EDT_BURNINGSVIDEO,
 
-		//! Direct3D8 device, only available on Win32 platforms.
-		/** Performs hardware accelerated rendering of 3D and 2D
-		primitives. */
-		EDT_DIRECT3D8,
+		//! Direct3D8 device is longer supported in Irrlicht. You have to go back to Irrlicht 1.8 if you still need that.
+		DEPRECATED_EDT_DIRECT3D8_NO_LONGER_EXISTS, // keep enum to avoid breaking enumeration order (might be used in ini-files, serialization, etc)
 
 		//! Direct3D 9 device, only available on Win32 platforms.
 		/** Performs hardware accelerated rendering of 3D and 2D
@@ -68,7 +66,17 @@ namespace video
 		"OpenGL 1.x/2.x/3.x",
 		0 
 	};
-	
+
+	const c8* const DRIVER_TYPE_NAMES_SHORT[] = 
+	{
+		"null",
+		"software",
+		"burning",
+		"d3d8",
+		"d3d9",
+		"opengl",
+		0 
+	};
 
 } // end namespace video
 } // end namespace irr

include/IMaterialRenderer.h

@@ -66,7 +66,7 @@ public:
 	\return Returns true if everything is ok, and false if nothing should
 	be rendered. The material renderer can choose to return false for
 	example if he doesn't support the specified vertex type. This is
-	actually done in D3D8 and D3D9 when using a normal mapped material with
+	actually done in D3D9 when using a normal mapped material with
 	a vertex type other than EVT_TANGENTS. */
 	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) { return true; }
 

include/IVideoModeList.h

@@ -14,12 +14,8 @@ namespace video
 {
 
 	//! A list of all available video modes.
-	/** You can get a list via IrrlichtDevice::getVideoModeList(). If you are confused
-	now, because you think you have to create an Irrlicht Device with a video
-	mode before being able to get the video mode list, let me tell you that
-	there is no need to start up an Irrlicht Device with EDT_DIRECT3D8, EDT_OPENGL or
-	EDT_SOFTWARE: For this (and for lots of other reasons) the null device,
-	EDT_NULL exists.*/
+	/** You can get a list via IrrlichtDevice::getVideoModeList(). 
+	You only need the null device (EDT_NULL) to get the video-modes. */
 	class IVideoModeList : public virtual IReferenceCounted
 	{
 	public:

include/IrrCompileConfig.h

@@ -135,20 +135,14 @@ while it runs and enabling it will slow down the engine. */
 #undef _IRR_COMPILE_WITH_PROFILING_
 #endif
 
-//! Define _IRR_COMPILE_WITH_DIRECT3D_8_ and _IRR_COMPILE_WITH_DIRECT3D_9_ to
-//! compile the Irrlicht engine with Direct3D8 and/or DIRECT3D9.
+//! Define _IRR_COMPILE_WITH_DIRECT3D_9_ to compile the Irrlicht engine with DIRECT3D9.
 /** If you only want to use the software device or opengl you can disable those defines.
 This switch is mostly disabled because people do not get the g++ compiler compile
 directX header files, and directX is only available on Windows platforms. If you
 are using Dev-Cpp, and want to compile this using a DX dev pack, you can define
 _IRR_COMPILE_WITH_DX9_DEV_PACK_. So you simply need to add something like this
 to the compiler settings: -DIRR_COMPILE_WITH_DX9_DEV_PACK
-and this to the linker settings: -ld3dx9 -ld3dx8
-
-Microsoft have chosen to remove D3D8 headers from their recent DXSDKs, and
-so D3D8 support is now disabled by default.  If you really want to build
-with D3D8 support, then you will have to source a DXSDK with the appropriate
-headers, e.g. Summer 2004.  This is a Microsoft issue, not an Irrlicht one.
+and this to the linker settings: -ld3dx9
 */
 #if defined(_IRR_WINDOWS_API_) && (!defined(__GNUC__) || defined(IRR_COMPILE_WITH_DX9_DEV_PACK))
 
@@ -164,13 +158,8 @@ If not defined, Windows Multimedia library is used, which offers also broad supp
 #undef _IRR_COMPILE_WITH_DIRECTINPUT_JOYSTICK_
 #endif
 
-//! Only define _IRR_COMPILE_WITH_DIRECT3D_8_ if you have an appropriate DXSDK, e.g. Summer 2004
-// #define _IRR_COMPILE_WITH_DIRECT3D_8_
+//! enabled Direct3D 9
 #define _IRR_COMPILE_WITH_DIRECT3D_9_
-
-#ifdef NO_IRR_COMPILE_WITH_DIRECT3D_8_
-#undef _IRR_COMPILE_WITH_DIRECT3D_8_
-#endif
 #ifdef NO_IRR_COMPILE_WITH_DIRECT3D_9_
 #undef _IRR_COMPILE_WITH_DIRECT3D_9_
 #endif

include/IrrlichtDevice.h

@@ -108,12 +108,9 @@ namespace irr
 		virtual ILogger* getLogger() = 0;
 
 		//! Gets a list with all video modes available.
-		/** If you are confused now, because you think you have to
-		create an Irrlicht Device with a video mode before being able
-		to get the video mode list, let me tell you that there is no
-		need to start up an Irrlicht Device with EDT_DIRECT3D8,
-		EDT_OPENGL or EDT_SOFTWARE: For this (and for lots of other
-		reasons) the null driver, EDT_NULL exists.
+		/** You only need a null driver (ED_NULL) to access 
+		those video modes. So you can get the available modes 
+		before starting any other video driver.
 		\return Pointer to a list with all video modes supported
 		by the gfx adapter. */
 		virtual video::IVideoModeList* getVideoModeList() = 0;
@@ -313,12 +310,6 @@ namespace irr
 					return true;
 #else
 					return false;
-#endif
-				case video::EDT_DIRECT3D8:
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-					return true;
-#else
-					return false;
 #endif
 				case video::EDT_DIRECT3D9:
 #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_

include/SExposedVideoData.h

@@ -40,19 +40,6 @@ struct SExposedVideoData
 		void* HWnd;
 	};
 
-	struct SD3D8
-	{
-		//! Pointer to the IDirect3D8 interface
-		IDirect3D8* D3D8;
-
-		//! Pointer to the IDirect3DDevice8 interface
-		IDirect3DDevice8* D3DDev8;
-
-		//! Window handle.
-		/** Get with for example with: HWND h = reinterpret_cast<HWND>(exposedData.D3D8.HWnd) */
-		void* HWnd;
-	};
-
 	struct SOpenGLWin32
 	{
 		//! Private GDI Device Context.
@@ -79,7 +66,6 @@ struct SExposedVideoData
 	union
 	{
 		SD3D9 D3D9;
-		SD3D8 D3D8;
 		SOpenGLWin32 OpenGLWin32;
 		SOpenGLLinux OpenGLLinux;
 	};

include/SIrrCreationParameters.h

@@ -97,9 +97,8 @@ namespace irr
 
 		//! Type of video driver used to render graphics.
 		/** This can currently be video::EDT_NULL, video::EDT_SOFTWARE,
-		video::EDT_BURNINGSVIDEO, video::EDT_DIRECT3D8,
-		video::EDT_DIRECT3D9, and video::EDT_OPENGL.
-		Default: Software. */
+		video::EDT_BURNINGSVIDEO, video::EDT_DIRECT3D9, and video::EDT_OPENGL.
+		Default: EDT_BURNINGSVIDEO. */
 		video::E_DRIVER_TYPE DriverType;
 
 		//! Size of the window or the video mode in fullscreen mode. Default: 800x600

include/irrlicht.h

@@ -230,7 +230,7 @@
  * int main()
  * {
  *	// start up the engine
- *	IrrlichtDevice *device = createDevice(video::EDT_DIRECT3D8,
+ *	IrrlichtDevice *device = createDevice(video::EDT_OPENGL,
  *		core::dimension2d<u32>(640,480));
  *
  *	video::IVideoDriver* driver = device->getVideoDriver();
@@ -309,7 +309,7 @@ namespace irr
 	/** If you need more parameters to be passed to the creation of the Irrlicht Engine device,
 	use the createDeviceEx() function.
 	\param deviceType: Type of the device. This can currently be video::EDT_NULL,
-	video::EDT_SOFTWARE, video::EDT_BURNINGSVIDEO, video::EDT_DIRECT3D8, video::EDT_DIRECT3D9 and video::EDT_OPENGL.
+	video::EDT_SOFTWARE, video::EDT_BURNINGSVIDEO, video::EDT_DIRECT3D9 and video::EDT_OPENGL.
 	\param windowSize: Size of the window or the video mode in fullscreen mode.
 	\param bits: Bits per pixel in fullscreen mode. Ignored if windowed mode.
 	\param fullscreen: Should be set to true if the device should run in fullscreen. Otherwise

media/d3d8.psh

-; part of the Irrlicht Engine Shader example.
-; This simple Direct3D9 pixel shader will be loaded by the engine.
-; Please note that these example shaders don't do anything really useful. 
-; They only demonstrate that shaders can be used in Irrlicht.
-
-ps.1.1
-
-tex t0             ; sample color map
-mul_x2 t0, t0, v0  ; mulitply with color
-add r0, t0, t0     ; make it brighter and store result

media/d3d8.vsh

-; part of the Irrlicht Engine Shader example.
-; This Direct3D9 vertex shader will be loaded by the engine.
-; Please note that these example shaders don't do anything really useful. 
-; They only demonstrate that shaders can be used in Irrlicht.
-
-vs.1.1
-
-; transpose and transform position to clip space 
-mul r0, v0.x, c4      
-mad r0, v0.y, c5, r0   
-mad r0, v0.z, c6, r0   
-add oPos, c7, r0       
-
-; transform normal 
-dp3 r1.x, v1, c0  
-dp3 r1.y, v1, c1  
-dp3 r1.z, v1, c2  
-
-; renormalize normal 
-dp3 r1.w, r1, r1  
-rsq r1.w, r1.w    
-mul r1, r1, r1.w  
-
-; calculate light vector 
-m4x4 r6, v0, c10      ; vertex into world position
-add r2, c8, -r6       ; vtxpos - lightpos
-
-; normalize light vector 
-dp3 r2.w, r2, r2  
-rsq r2.w, r2.w    
-mul r2, r2, r2.w  
-
-; calculate light color 
-dp3 r3, r1, r2       ; dp3 with negative light vector 
-lit r5, r3           ; clamp to zero if r3 < 0, r5 has diffuce component in r5.y
-mul oD0, r5.y, c9    ; ouput diffuse color 
-mov oT0, v3          ; store texture coordinates

source/Irrlicht/CD3D8NormalMapRenderer.cpp

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-
-#include "CD3D8NormalMapRenderer.h"
-#include "IMaterialRendererServices.h"
-#include "IVideoDriver.h"
-#include "os.h"
-#include "SLight.h"
-
-namespace irr
-{
-namespace video
-{
-
-	// 1.1 Shaders with two lights and vertex based attenuation
-
-	// Irrlicht Engine D3D8 render path normal map vertex shader
-	const char D3D8_NORMAL_MAP_VSH[] =
-		";Irrlicht Engine 0.8 D3D8 render path normal map vertex shader\n"\
-		"; c0-3: Transposed world matrix \n"\
-		"; c8-11: Transposed worldViewProj matrix (Projection * View * World) \n"\
-		"; c12: Light01 position \n"\
-		"; c13: x,y,z: Light01 color; .w: 1/LightRadius \n"\
-		"; c14: Light02 position \n"\
-		"; c15: x,y,z: Light02 color; .w: 1/LightRadius \n"\
-		"\n"\
-		"; v0 - position \n"\
-		"; v1 - normal \n"\
-		"; v2 - color \n"\
-		"; v3 - texture coord \n"\
-		"; v4 - tangent \n"\
-		"; v5 - binormal \n"\
-		"\n"\
-		"vs.1.1\n"\
-		"\n"\
-		"m4x4 oPos, v0, c8             ; transform position to clip space with worldViewProj matrix\n"\
-        "\n"\
-		"m3x3 r5, v4, c0               ; transform tangent U\n"\
-		"m3x3 r7, v1, c0               ; transform normal W\n"\
-		"m3x3 r6, v5, c0               ; transform binormal V\n"\
-		"\n"\
-		"m4x4 r4, v0, c0               ; vertex into world position\n"\
-		"add r2, c12, -r4              ; vtxpos - lightpos1\n"\
-		"add r3, c14, -r4              ; vtxpos - lightpos2\n"\
-		"\n"\
-		"dp3 r8.x, r5, r2              ; transform the light vector 1 with U, V, W\n"\
-		"dp3 r8.y, r6, r2   \n"\
-		"dp3 r8.z, r7, r2   \n"\
-		"dp3 r9.x, r5, r3              ; transform the light vector 2 with U, V, W\n"\
-		"dp3 r9.y, r6, r3   \n"\
-		"dp3 r9.z, r7, r3   \n"\
-		"\n"\
-		"dp3 r8.w, r8, r8              ; normalize light vector 1 (r8)\n"\
-		"rsq r8.w, r8.w    \n"\
-		"mul r8, r8, r8.w  \n"\
-		"dp3 r9.w, r9, r9              ; normalize light vector 2 (r9)\n"\
-		"rsq r9.w, r9.w    \n"\
-		"mul r9, r9, r9.w  \n"\
-		"\n"\
-		"mad oT2.xyz, r8.xyz, c95, c95 ; move light vector 1 from -1..1 into 0..1 \n"\
-		"mad oT3.xyz, r9.xyz, c95, c95 ; move light vector 2 from -1..1 into 0..1 \n"\
-		"\n"\
-		" ; calculate attenuation of light 1 \n"\
-		"dp3 r2.x, r2.xyz, r2.xyz      ; r2.x = r2.x + r2.y + r2.z \n"\
-		"mul r2.x, r2.x, c13.w         ; r2.x * attenutation \n"\
-		"rsq r2, r2.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
-		"mul oD0, r2, c13              ; resulting light color = lightcolor * attenuation \n"\
-		"\n"\
-		" ; calculate attenuation of light 2 \n"\
-		"dp3 r3.x, r3.xyz, r3.xyz      ; r3.x = r3.x + r3.y + r3.z \n"\
-		"mul r3.x, r3.x, c15.w         ; r2.x * attenutation \n"\
-		"rsq r3, r3.x                  ; r2.xyzw = 1/sqrt(r2.x * attenutation)\n"\
-		"mul oD1, r3, c15              ; resulting light color = lightcolor * attenuation \n"\
-		"\n"\
-		"mov oT0.xy, v3.xy             ; move out texture coordinates 1\n"\
-		"mov oT1.xy, v3.xy             ; move out texture coordinates 2\n"\
-		"mov oD0.a, v2.a               ; move out original alpha value \n"\
-		"\n";
-
-	// Irrlicht Engine D3D8 render path normal map pixel shader
-	const char D3D8_NORMAL_MAP_PSH[] =
-		";Irrlicht Engine 0.8 D3D8 render path normal map pixel shader\n"\
-		";Input: \n"\
-		";t0: color map texture coord \n"\
-		";t1: normal map texture coords \n"\
-		";t2: light 1 vector in tangent space \n"\
-		";v0: light 1 color \n"\
-		";t3: light 2 vector in tangent space \n"\
-		";v1: light 2 color \n"\
-		";v0.a: vertex alpha value  \n"\
-		"ps.1.1 \n"\
-		"tex t0                     ; sample color map \n"\
-		"tex t1                     ; sample normal map\n"\
-		"texcoord t2     			; fetch light vector 1\n"\
-		"texcoord t3     			; fetch light vector 2\n"\
-		"\n"\
-		"dp3_sat r0, t1_bx2, t2_bx2 ; normal dot light 1 (_bx2 because moved into 0..1)\n"\
-		"mul r0, r0, v0             ; luminance1 * light color 1 \n"\
-		"\n"\
-		"dp3_sat r1, t1_bx2, t3_bx2 ; normal dot light 2 (_bx2 because moved into 0..1)\n"\
-		"mad r0, r1, v1, r0         ; (luminance2 * light color 2) + luminance 1 \n"\
-		"\n"\
-		"mul r0, t0, r0             ; total luminance * base color\n"\
-		"mov r0.a, v0.a             ; write interpolated vertex alpha value \n"\
-		"\n"\
-		"";
-
-	CD3D8NormalMapRenderer::CD3D8NormalMapRenderer(
-		IDirect3DDevice8* d3ddev, video::IVideoDriver* driver,
-		s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial)
-		: CD3D8ShaderMaterialRenderer(d3ddev, driver, 0, baseMaterial),
-		CompiledShaders(true)
-	{
-
-		#ifdef _DEBUG
-		setDebugName("CD3D8NormalMapRenderer");
-		#endif
-
-		// set this as callback. We could have done this in
-		// the initialization list, but some compilers don't like it.
-
-		CallBack = this;
-
-		// basicly, this thing simply compiles these hardcoded shaders if the
-		// hardware is able to do them, otherwise it maps to the base material
-
-		if (!driver->queryFeature(video::EVDF_PIXEL_SHADER_1_1) ||
-			!driver->queryFeature(video::EVDF_VERTEX_SHADER_1_1))
-		{
-			// this hardware is not able to do shaders. Fall back to
-			// base material.
-			outMaterialTypeNr = driver->addMaterialRenderer(this);
-			return;
-		}
-
-        // check if already compiled normal map shaders are there.
-
-		video::IMaterialRenderer* renderer = driver->getMaterialRenderer(EMT_NORMAL_MAP_SOLID);
-		if (renderer)
-		{
-			// use the already compiled shaders
-			video::CD3D8NormalMapRenderer* nmr = (video::CD3D8NormalMapRenderer*)renderer;
-			CompiledShaders = false;
-
-			VertexShader = nmr->VertexShader;
-			PixelShader = nmr->PixelShader;
-
-			outMaterialTypeNr = driver->addMaterialRenderer(this);
-		}
-		else
-		{
-			// compile shaders on our own
-			init(outMaterialTypeNr, D3D8_NORMAL_MAP_VSH, D3D8_NORMAL_MAP_PSH, EVT_TANGENTS);
-		}
-		// something failed, use base material
-		if (-1==outMaterialTypeNr)
-			driver->addMaterialRenderer(this);
-	}
-
-
-	CD3D8NormalMapRenderer::~CD3D8NormalMapRenderer()
-	{
-		if (CallBack == this)
-			CallBack = 0;
-
-		if (!CompiledShaders)
-		{
-			// prevent this from deleting shaders we did not create
-			VertexShader = 0;
-			PixelShader = 0;
-		}
-	}
-
-
-	bool CD3D8NormalMapRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
-	{
-		if (vtxtype != video::EVT_TANGENTS)
-		{
-			os::Printer::log("Error: Normal map renderer only supports vertices of type EVT_TANGENTS", ELL_ERROR);
-			return false;
-		}
-
-		return CD3D8ShaderMaterialRenderer::OnRender(service, vtxtype);
-	}
-
-	//! Returns the render capability of the material.
-	s32 CD3D8NormalMapRenderer::getRenderCapability() const
-	{
-		if (Driver->queryFeature(video::EVDF_PIXEL_SHADER_1_1) &&
-			Driver->queryFeature(video::EVDF_VERTEX_SHADER_1_1))
-			return 0;
-
-		return 1;
-	}
-
-
-	//! Called by the engine when the vertex and/or pixel shader constants for an
-	//! material renderer should be set.
-	void CD3D8NormalMapRenderer::OnSetConstants(IMaterialRendererServices* services, s32 userData)
-	{
-		video::IVideoDriver* driver = services->getVideoDriver();
-
-		// set transposed world matrix
-		services->setVertexShaderConstant(driver->getTransform(video::ETS_WORLD).getTransposed().pointer(), 0, 4);
-
-		// set transposed worldViewProj matrix
-		core::matrix4 worldViewProj(driver->getTransform(video::ETS_PROJECTION));
-		worldViewProj *= driver->getTransform(video::ETS_VIEW);
-		worldViewProj *= driver->getTransform(video::ETS_WORLD);
-		services->setVertexShaderConstant(worldViewProj.getTransposed().pointer(), 8, 4);
-
-		// here we've got to fetch the fixed function lights from the
-		// driver and set them as constants
-
-		u32 cnt = driver->getDynamicLightCount();
-
-		for (u32 i=0; i<2; ++i)
-		{
-			SLight light;
-
-			if (i<cnt)
-				light = driver->getDynamicLight(i);
-			else
-			{
-				light.DiffuseColor.set(0,0,0); // make light dark
-				light.Radius = 1.0f;
-			}
-
-			light.DiffuseColor.a = 1.0f/(light.Radius*light.Radius); // set attenuation
-
-			services->setVertexShaderConstant(reinterpret_cast<const f32*>(&light.Position), 12+(i*2), 1);
-			services->setVertexShaderConstant(reinterpret_cast<const f32*>(&light.DiffuseColor), 13+(i*2), 1);
-		}
-
-		f32 c95[] = {0.5f, 0.5f, 0.5f, 0.5f};
-		services->setVertexShaderConstant(c95, 95, 1);
-	}
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif // _IRR_COMPILE_WITH_DIRECT3D_8_
-

source/Irrlicht/CD3D8NormalMapRenderer.h

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_D3D8_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D8_NORMAL_MAPMATERIAL_RENDERER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_WINDOWS_API_
-
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-#include <d3d8.h>
-
-#include "CD3D8ShaderMaterialRenderer.h"
-#include "IShaderConstantSetCallBack.h"
-
-namespace irr
-{
-namespace video
-{
-
-//! Renderer for normal maps
-class CD3D8NormalMapRenderer : public CD3D8ShaderMaterialRenderer, IShaderConstantSetCallBack
-{
-public:
-
-	CD3D8NormalMapRenderer(
-		IDirect3DDevice8* d3ddev, video::IVideoDriver* driver,
-		s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial);
-	~CD3D8NormalMapRenderer();
-
-	//! Called by the engine when the vertex and/or pixel shader constants for an
-	//! material renderer should be set.
-	virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) _IRR_OVERRIDE_;
-
-	bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype);
-
-	//! Returns the render capability of the material.
-	virtual s32 getRenderCapability() const _IRR_OVERRIDE_;
-
-private:
-
-	//! stores if this shader compiled the shaders and is
-	//! allowed to delete them again. D3D8 lacks reference counting
-	//! support for shaders.
-	bool CompiledShaders;
-
-};
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-#endif
-#endif
-

source/Irrlicht/CD3D8ParallaxMapRenderer.h

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_D3D8_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D8_PARALLAX_MAPMATERIAL_RENDERER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_WINDOWS_API_
-
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-#include <d3d8.h>
-
-#include "CD3D8ShaderMaterialRenderer.h"
-#include "IShaderConstantSetCallBack.h"
-
-namespace irr
-{
-namespace video
-{
-
-//! Renderer for parallax maps
-class CD3D8ParallaxMapRenderer : public CD3D8ShaderMaterialRenderer, IShaderConstantSetCallBack
-{
-public:
-
-	CD3D8ParallaxMapRenderer(
-		IDirect3DDevice8* d3ddev, video::IVideoDriver* driver,
-		s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial);
-	~CD3D8ParallaxMapRenderer();
-
-	//! Called by the engine when the vertex and/or pixel shader constants for an
-	//! material renderer should be set.
-	virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) _IRR_OVERRIDE_;
-
-	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_;
-
-	virtual void OnSetMaterial(const SMaterial& material) _IRR_OVERRIDE_ { }
-	virtual void OnSetMaterial(const video::SMaterial& material,
-		const video::SMaterial& lastMaterial,
-		bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_;
-
-	//! Returns the render capability of the material.
-	virtual s32 getRenderCapability() const _IRR_OVERRIDE_;
-
-private:
-
-	//! stores if this shader compiled the shaders and is
-	//! allowed to delete them again. D3D8 lacks reference counting
-	//! support for shaders.
-	bool CompiledShaders;
-
-	f32 CurrentScale;
-};
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-#endif
-#endif
-

source/Irrlicht/CD3D8ShaderMaterialRenderer.cpp

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#include "CD3D8ShaderMaterialRenderer.h"
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-#include <d3d8.h>
-#include <d3dx8core.h>
-#pragma comment (lib, "d3dx8.lib")
-
-#include "IShaderConstantSetCallBack.h"
-#include "IMaterialRendererServices.h"
-#include "IVideoDriver.h"
-#include "os.h"
-
-#ifndef _IRR_D3D_NO_SHADER_DEBUGGING
-#include <stdio.h>
-#endif
-
-namespace irr
-{
-namespace video
-{
-
-//! Public constructor
-CD3D8ShaderMaterialRenderer::CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, video::IVideoDriver* driver,
-		s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram,
-		IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData)
-: pID3DDevice(d3ddev), Driver(driver), CallBack(callback), BaseMaterial(baseMaterial),
-	VertexShader(0), OldVertexShader(0), PixelShader(0), UserData(userData)
-{
-
-	#ifdef _DEBUG
-	setDebugName("CD3D8ShaderMaterialRenderer");
-	#endif
-
-	if (BaseMaterial)
-		BaseMaterial->grab();
-
-	if (CallBack)
-		CallBack->grab();
-
-	init(outMaterialTypeNr, vertexShaderProgram, pixelShaderProgram, EVT_STANDARD);
-}
-
-//! constructor only for use by derived classes who want to
-//! create a fall back material for example.
-CD3D8ShaderMaterialRenderer::CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev,
-														 video::IVideoDriver* driver,
-														 IShaderConstantSetCallBack* callback,
-														 IMaterialRenderer* baseMaterial,
-														 s32 userData)
-: pID3DDevice(d3ddev), Driver(driver), BaseMaterial(baseMaterial), CallBack(callback),
-	VertexShader(0), PixelShader(0), UserData(userData)
-{
-	if (BaseMaterial)
-		BaseMaterial->grab();
-
-	if (CallBack)
-		CallBack->grab();
-}
-
-
-
-//! Destructor
-CD3D8ShaderMaterialRenderer::~CD3D8ShaderMaterialRenderer()
-{
-	if (CallBack)
-		CallBack->drop();
-
-	if (VertexShader)
-		pID3DDevice->DeleteVertexShader(VertexShader);
-
-	if (PixelShader)
-		pID3DDevice->DeletePixelShader(PixelShader);
-
-	if (BaseMaterial)
-		BaseMaterial->drop ();
-}
-
-
-void CD3D8ShaderMaterialRenderer::init(s32& outMaterialTypeNr, const c8* vertexShaderProgram,
-									   const c8* pixelShaderProgram, E_VERTEX_TYPE type)
-{
-	outMaterialTypeNr = -1;
-
-	// create vertex shader
-	if (!createVertexShader(vertexShaderProgram, type))
-		return;
-
-	// create pixel shader
-	if (!createPixelShader(pixelShaderProgram))
-		return;
-
-	// register myself as new material
-	outMaterialTypeNr = Driver->addMaterialRenderer(this);
-}
-
-
-bool CD3D8ShaderMaterialRenderer::OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype)
-{
-	// call callback to set shader constants
-	if (CallBack && (VertexShader || PixelShader))
-		CallBack->OnSetConstants(service, UserData);
-
-	return true;
-}
-
-
-void CD3D8ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
-	bool resetAllRenderstates, video::IMaterialRendererServices* services)
-{
-	if (material.MaterialType != lastMaterial.MaterialType || resetAllRenderstates)
-	{
-		if (VertexShader)
-		{
-			// We do not need to save and reset the old vertex shader, because
-			// in D3D8, this is mixed up with the fvf, and this is set by the driver
-			// every time.
-			//pID3DDevice->GetVertexShader(&OldVertexShader);
-
-			// set new vertex shader
-			if (FAILED(pID3DDevice->SetVertexShader(VertexShader)))
-				os::Printer::log("Could not set vertex shader.", ELL_ERROR);
-		}
-
-		// set new pixel shader
-		if (PixelShader)
-		{
-			if (FAILED(pID3DDevice->SetPixelShader(PixelShader)))
-				os::Printer::log("Could not set pixel shader.", ELL_ERROR);
-		}
-	}
-
-	services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
-
-	if (BaseMaterial)
-        BaseMaterial->OnSetMaterial(material, lastMaterial, resetAllRenderstates, services);
-
-	if (CallBack)
-		CallBack->OnSetMaterial(material);
-}
-
-void CD3D8ShaderMaterialRenderer::OnUnsetMaterial()
-{
-	// We do not need to save and reset the old vertex shader, because
-	// in D3D8, this is mixed up with the fvf, and this is set by the driver
-	// every time.
-	//	if (VertexShader)
-	//		pID3DDevice->SetVertexShader(OldVertexShader);
-
-	if (PixelShader)
-		pID3DDevice->SetPixelShader(0);
-
-	if (BaseMaterial)
-		BaseMaterial->OnUnsetMaterial();
-}
-
-
-//! Returns if the material is transparent. The scene managment needs to know this
-//! for being able to sort the materials by opaque and transparent.
-bool CD3D8ShaderMaterialRenderer::isTransparent()  const
-{
-	return BaseMaterial ? BaseMaterial->isTransparent() : false;
-}
-
-bool CD3D8ShaderMaterialRenderer::createPixelShader(const c8* pxsh)
-{
-	if (!pxsh)
-		return true;
-
-#if defined( _IRR_XBOX_PLATFORM_)
-	return false;
-#else
-	// compile shader
-
-	LPD3DXBUFFER code = 0;
-	LPD3DXBUFFER errors = 0;
-
-	#ifdef _IRR_D3D_NO_SHADER_DEBUGGING
-
-		// compile shader without debug info
-		D3DXAssembleShader(pxsh, (UINT)strlen(pxsh), 0, 0, &code, &errors);
-
-	#else
-
-		// compile shader and emitt some debug informations to
-		// make it possible to debug the shader in visual studio
-
-		static int irr_dbg_file_nr = 0;
-		++irr_dbg_file_nr;
-		char tmp[32];
-		sprintf(tmp, "irr_d3d8_dbg_shader_%d.psh", irr_dbg_file_nr);
-
-		FILE* f = fopen(tmp, "wb");
-		fwrite(pxsh, strlen(pxsh), 1, f);
-		fflush(f);
-		fclose(f);
-
-		D3DXAssembleShaderFromFile(tmp, D3DXASM_DEBUG, 0, &code, &errors);
-	#endif
-	if (errors)
-	{
-		// print out compilation errors.
-		os::Printer::log("Pixel shader compilation failed:", ELL_ERROR);
-		os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
-
-		if (code)
-			code->Release();
-
-		errors->Release();
-		return false;
-	}
-
-	if (FAILED(pID3DDevice->CreatePixelShader((DWORD*)code->GetBufferPointer(), &PixelShader)))
-	{
-		os::Printer::log("Could not create pixel shader.", ELL_ERROR);
-		code->Release();
-		return false;
-	}
-
-	code->Release();
-	return true;
-#endif
-
-}
-
-
-
-bool CD3D8ShaderMaterialRenderer::createVertexShader(const char* vtxsh, E_VERTEX_TYPE type)
-{
-	if (!vtxsh)
-		return true;
-
-	// compile shader
-#if defined( _IRR_XBOX_PLATFORM_)
-	return false;
-#else
-
-	LPD3DXBUFFER code = 0;
-	LPD3DXBUFFER errors = 0;
-
-	#ifdef _IRR_D3D_NO_SHADER_DEBUGGING
-
-		// compile shader without debug info
-		D3DXAssembleShader(vtxsh, (UINT)strlen(vtxsh), 0, 0, &code, &errors);
-
-	#else
-
-		// compile shader and emitt some debug informations to
-		// make it possible to debug the shader in visual studio
-		static int irr_dbg_file_nr = 0;
-		++irr_dbg_file_nr;
-		char tmp[32];
-		sprintf(tmp, "irr_d3d8_dbg_shader_%d.vsh", irr_dbg_file_nr);
-
-		FILE* f = fopen(tmp, "wb");
-		fwrite(vtxsh, strlen(vtxsh), 1, f);
-		fflush(f);
-		fclose(f);
-
-		D3DXAssembleShaderFromFile(tmp, D3DXASM_DEBUG, 0, &code, &errors);
-
-	#endif
-
-
-	if (errors)
-	{
-		// print out compilation errors.
-		os::Printer::log("Vertex shader compilation failed:", ELL_ERROR);
-		os::Printer::log((c8*)errors->GetBufferPointer(), ELL_ERROR);
-
-		if (code)
-			code->Release();
-
-		errors->Release();
-		return false;
-	}
-
-	DWORD* decl = 0;
-
-	DWORD dwStdDecl[] =
-	{
-		D3DVSD_STREAM(0),
-		D3DVSD_REG(0, D3DVSDT_FLOAT3),   // position 0
-		D3DVSD_REG(1, D3DVSDT_FLOAT3),   // normal 1
-		D3DVSD_REG(2, D3DVSDT_D3DCOLOR ),// color 2
-		D3DVSD_REG(3, D3DVSDT_FLOAT2 ),  // tex1 3
-		D3DVSD_REG(4, D3DVSDT_FLOAT2 ),  // tex2 4
-		D3DVSD_END()
-	};
-
-	DWORD dwTngtDecl[] =
-	{
-		D3DVSD_STREAM(0),
-		D3DVSD_REG(0 , D3DVSDT_FLOAT3),   // position 0
-		D3DVSD_REG(1 , D3DVSDT_FLOAT3),   // normal 1
-		D3DVSD_REG(2 , D3DVSDT_D3DCOLOR ),// color 2
-		D3DVSD_REG(3 , D3DVSDT_FLOAT2 ),  // tex1 3
-		D3DVSD_REG(4, D3DVSDT_FLOAT3 ),  // tangent 4
-		D3DVSD_REG(5, D3DVSDT_FLOAT3 ),  // binormal 5
-		D3DVSD_END()
-	};
-
-	if (type == EVT_TANGENTS)
-		decl = dwTngtDecl;
-	else
-		decl = dwStdDecl;
-
-	if (FAILED(pID3DDevice->CreateVertexShader(decl,
-		(DWORD*)code->GetBufferPointer(), &VertexShader, 0)))
-	{
-		os::Printer::log("Could not create vertex shader.", ELL_ERROR);
-		code->Release();
-		return false;
-	}
-
-	code->Release();
-	return true;
-#endif
-}
-
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif // _IRR_COMPILE_WITH_DIRECT3D_8_
-

source/Irrlicht/CD3D8ShaderMaterialRenderer.h

-// Copyright (C) 2002-2012 Nikolaus Gebhardt
-// This file is part of the "Irrlicht Engine".
-// For conditions of distribution and use, see copyright notice in irrlicht.h
-
-#ifndef __C_D3D8_SHADER_MATERIAL_RENDERER_H_INCLUDED__
-#define __C_D3D8_SHADER_MATERIAL_RENDERER_H_INCLUDED__
-
-#include "IrrCompileConfig.h"
-#ifdef _IRR_WINDOWS_API_
-
-#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
-#include <d3d8.h>
-#include <d3dx8core.h>
-
-#include "IMaterialRenderer.h"
-#include "S3DVertex.h"
-
-namespace irr
-{
-namespace video
-{
-
-class IVideoDriver;
-class IShaderConstantSetCallBack;
-class IMaterialRenderer;
-
-//! Class for using vertex and pixel shaders with D3D8
-class CD3D8ShaderMaterialRenderer : public IMaterialRenderer
-{
-public:
-
-	//! Public constructor
-	CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, video::IVideoDriver* driver,
-		s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram,
-		IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData);
-
-	//! Destructor
-	~CD3D8ShaderMaterialRenderer();
-
-	virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial,
-		bool resetAllRenderstates, video::IMaterialRendererServices* services) _IRR_OVERRIDE_;
-
-	virtual void OnUnsetMaterial() _IRR_OVERRIDE_;
-
-	virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype) _IRR_OVERRIDE_;
-
-	//! Returns if the material is transparent.
-	virtual bool isTransparent() const _IRR_OVERRIDE_;
-
-protected:
-
-	//! constructor only for use by derived classes who want to
-	//! create a fall back material for example.
-	CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev,
-								video::IVideoDriver* driver,
-								IShaderConstantSetCallBack* callback,
-								IMaterialRenderer* baseMaterial, s32 userData=0);
-
-	void init(s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram,
-		E_VERTEX_TYPE type);
-	bool createPixelShader(const c8* pxsh);
-	bool createVertexShader(const char* vtxsh, E_VERTEX_TYPE type);
-
-	IDirect3DDevice8* pID3DDevice;
-	video::IVideoDriver* Driver;
-	IShaderConstantSetCallBack* CallBack;
-	IMaterialRenderer* BaseMaterial;
-
-	DWORD VertexShader;
-	DWORD OldVertexShader;
-	DWORD PixelShader;
-	s32 UserData;
-};
-
-
-} // end namespace video
-} // end namespace irr
-
-#endif
-#endif
-#endif
-

source/Irrlicht/CD3D9Driver.h

@@ -484,8 +484,8 @@ namespace video
 		bool AlphaToCoverageSupport;
 	};
 
-	//! This bridge between Irlicht pseudo D3D8 calls
-	//! and true D3D8 calls.
+	//! This bridge between Irlicht pseudo D3D9 calls
+	//! and true D3D9 calls.
 
 	class CD3D9CallBridge
 	{

source/Irrlicht/CD3D9Texture.cpp

@@ -12,18 +12,6 @@
 
 #include <d3dx9tex.h>
 
-#ifndef _IRR_COMPILE_WITH_DIRECT3D_8_
-// The D3DXFilterTexture function seems to get linked wrong when
-// compiling with both D3D8 and 9, causing it not to work in the D3D9 device.
-// So mipmapgeneration is replaced with my own bad generation in d3d 8 when
-// compiling with both D3D 8 and 9.
-// #define _IRR_USE_D3DXFilterTexture_
-#endif // _IRR_COMPILE_WITH_DIRECT3D_8_
-
-#ifdef _IRR_USE_D3DXFilterTexture_
-#pragma comment(lib, "d3dx9.lib")
-#endif
-
 namespace irr
 {
 namespace video
@@ -732,14 +720,6 @@ void CD3D9Texture::regenerateMipMapLevels(void* mipmapData)
 	}
 	else if (HasMipMaps)
 	{
-		// create mip maps.
-#ifdef _IRR_USE_D3DXFilterTexture_
-		// The D3DXFilterTexture function seems to get linked wrong when
-		// compiling with both D3D8 and 9, causing it not to work in the D3D9 device.
-		// So mipmapgeneration is replaced with my own bad generation
-		HRESULT hr  = D3DXFilterTexture(Texture, NULL, D3DX_DEFAULT, D3DX_DEFAULT);
-		if (FAILED(hr))
-#endif
 		createMipMaps();
 	}
 }