Skip to content

D
deprecated-irrlicht-mac
Commit f36090db authored by hybrid's avatar hybrid
Browse files
Options

Finally change d3d drivers over to the compact parameter passing version 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3683 dfc29bdd-3216-0410-991c-e03cc46cb475
parent f2881984
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 56 deletions
source/Irrlicht/CD3D8Driver.cpp
View file @ f36090db
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "CD3D8ShaderMaterialRenderer.h" #include "CD3D8ShaderMaterialRenderer.h"
#include "CD3D8NormalMapRenderer.h" #include "CD3D8NormalMapRenderer.h"
#include "CD3D8ParallaxMapRenderer.h" #include "CD3D8ParallaxMapRenderer.h"
#include "SIrrCreationParameters.h"
namespace irr namespace irr
{ {
...@@ -2410,16 +2411,14 @@ namespace video ...@@ -2410,16 +2411,14 @@ namespace video
#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
//! creates a video driver //! creates a video driver
IVideoDriver* createDirectX8Driver(const core::dimension2d<u32>& screenSize, IVideoDriver* createDirectX8Driver(const SIrrlichtCreationParameters& params,
HWND window, u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, HWND window)
io::IFileSystem* io, bool pureSoftware, bool highPrecisionFPU,
bool vsync, u8 antiAlias, u32 displayAdapter)
{ {
CD3D8Driver* dx8 = new CD3D8Driver(screenSize, window, fullscreen, const bool pureSoftware = false;
stencilbuffer, io, pureSoftware); CD3D8Driver* dx8 = new CD3D8Driver(params.WindowSize, window, params.Fullscreen, params.Stencilbuffer, io, pureSoftware);
if (!dx8->initDriver(screenSize, window, bits, fullscreen, if (!dx8->initDriver(params.WindowSize, window, params.Bits, params.Fullscreen, pureSoftware, params.HighPrecisionFPU,
pureSoftware, highPrecisionFPU, vsync, antiAlias, displayAdapter)) params.Vsync, params.AntiAlias, params.DisplayAdapter))
{ {
dx8->drop(); dx8->drop();
dx8 = 0; dx8 = 0;
......
source/Irrlicht/CD3D9Driver.cpp
View file @ f36090db
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "CD3D9NormalMapRenderer.h" #include "CD3D9NormalMapRenderer.h"
#include "CD3D9ParallaxMapRenderer.h" #include "CD3D9ParallaxMapRenderer.h"
#include "CD3D9HLSLMaterialRenderer.h" #include "CD3D9HLSLMaterialRenderer.h"
#include "SIrrCreationParameters.h"
namespace irr namespace irr
{ {
...@@ -3493,13 +3494,13 @@ namespace video ...@@ -3493,13 +3494,13 @@ namespace video
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
//! creates a video driver //! creates a video driver
IVideoDriver* createDirectX9Driver(const core::dimension2d<u32>& screenSize, IVideoDriver* createDirectX9Driver(const SIrrlichtCreationParameters& params,
HWND window, u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, HWND window)
io::IFileSystem* io, bool pureSoftware, bool highPrecisionFPU,
bool vsync, u8 antiAlias, u32 displayAdapter)
{ {
CD3D9Driver* dx9 = new CD3D9Driver(screenSize, window, fullscreen, stencilbuffer, io, pureSoftware); const bool pureSoftware = false;
if (!dx9->initDriver(screenSize, window, bits, fullscreen, pureSoftware, highPrecisionFPU, vsync, antiAlias, displayAdapter)) CD3D9Driver* dx9 = new CD3D9Driver(params.WindowSize, window, params.Fullscreen, params.Stencilbuffer, io, pureSoftware);
if (!dx9->initDriver(params.WindowSize, window, params.Bits, params.Fullscreen, pureSoftware, params.HighPrecisionFPU,
params.Vsync, params.AntiAlias, params.DisplayAdapter))
{ {
dx9->drop(); dx9->drop();
dx9 = 0; dx9 = 0;
......
source/Irrlicht/CIrrDeviceSDL.cpp
View file @ f36090db
...@@ -30,15 +30,13 @@ namespace irr ...@@ -30,15 +30,13 @@ namespace irr
{ {
#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
IVideoDriver* createDirectX8Driver(const core::dimension2d<u32>& screenSize, HWND window, IVideoDriver* createDirectX8Driver(const irr::SIrrlichtCreationParameters& params,
u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, io::IFileSystem* io, HWND window);
bool pureSoftware, bool highPrecisionFPU, bool vsync, u8 antiAlias, u32 displayAdapter);
#endif #endif
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
IVideoDriver* createDirectX9Driver(const core::dimension2d<u32>& screenSize, HWND window, IVideoDriver* createDirectX9Driver(const irr::SIrrlichtCreationParameters& params,
u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, io::IFileSystem* io, HWND window);
bool pureSoftware, bool highPrecisionFPU, bool vsync, u8 antiAlias, u32 displayAdapter);
#endif #endif
#ifdef _IRR_COMPILE_WITH_OPENGL_ #ifdef _IRR_COMPILE_WITH_OPENGL_
...@@ -223,11 +221,7 @@ void CIrrDeviceSDL::createDriver() ...@@ -223,11 +221,7 @@ void CIrrDeviceSDL::createDriver()
case video::EDT_DIRECT3D8: case video::EDT_DIRECT3D8:
#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
VideoDriver = video::createDirectX8Driver(CreationParams.WindowSize, Info.window, VideoDriver = video::createDirectX8Driver(CreationParams, FileSystem, HWnd);
CreationParams.Bits, CreationParams.Fullscreen, CreationParams.Stencilbuffer,
FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync,
CreationParams.AntiAlias, CreationParams.DisplayAdapter);
if (!VideoDriver) if (!VideoDriver)
{ {
os::Printer::log("Could not create DIRECT3D8 Driver.", ELL_ERROR); os::Printer::log("Could not create DIRECT3D8 Driver.", ELL_ERROR);
...@@ -241,11 +235,7 @@ void CIrrDeviceSDL::createDriver() ...@@ -241,11 +235,7 @@ void CIrrDeviceSDL::createDriver()
case video::EDT_DIRECT3D9: case video::EDT_DIRECT3D9:
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
VideoDriver = video::createDirectX9Driver(CreationParams.WindowSize, Info.window, VideoDriver = video::createDirectX9Driver(CreationParams, FileSystem, HWnd);
CreationParams.Bits, CreationParams.Fullscreen, CreationParams.Stencilbuffer,
FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync,
CreationParams.AntiAlias, CreationParams.DisplayAdapter);
if (!VideoDriver) if (!VideoDriver)
{ {
os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR); os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR);
......
source/Irrlicht/CIrrDeviceWin32.cpp
View file @ f36090db
...@@ -23,15 +23,13 @@ namespace irr ...@@ -23,15 +23,13 @@ namespace irr
namespace video namespace video
{ {
#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
IVideoDriver* createDirectX8Driver(const core::dimension2d<u32>& screenSize, HWND window, IVideoDriver* createDirectX8Driver(const irr::SIrrlichtCreationParameters& params,
u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, io::IFileSystem* io, HWND window);
bool pureSoftware, bool highPrecisionFPU, bool vsync, u8 antiAlias, u32 displayAdapter);
#endif #endif
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
IVideoDriver* createDirectX9Driver(const core::dimension2d<u32>& screenSize, HWND window, IVideoDriver* createDirectX9Driver(const irr::SIrrlichtCreationParameters& params,
u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, io::IFileSystem* io, HWND window);
bool pureSoftware, bool highPrecisionFPU, bool vsync, u8 antiAlias, u32 displayAdapter);
#endif #endif
#ifdef _IRR_COMPILE_WITH_OPENGL_ #ifdef _IRR_COMPILE_WITH_OPENGL_
...@@ -668,10 +666,7 @@ void CIrrDeviceWin32::createDriver() ...@@ -668,10 +666,7 @@ void CIrrDeviceWin32::createDriver()
case video::EDT_DIRECT3D8: case video::EDT_DIRECT3D8:
#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
VideoDriver = video::createDirectX8Driver(CreationParams.WindowSize, HWnd, VideoDriver = video::createDirectX8Driver(CreationParams, FileSystem, HWnd);
CreationParams.Bits, CreationParams.Fullscreen, CreationParams.Stencilbuffer,
FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync,
CreationParams.AntiAlias, CreationParams.DisplayAdapter);
if (!VideoDriver) if (!VideoDriver)
{ {
...@@ -686,10 +681,7 @@ void CIrrDeviceWin32::createDriver() ...@@ -686,10 +681,7 @@ void CIrrDeviceWin32::createDriver()
case video::EDT_DIRECT3D9: case video::EDT_DIRECT3D9:
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
VideoDriver = video::createDirectX9Driver(CreationParams.WindowSize, HWnd, VideoDriver = video::createDirectX9Driver(CreationParams, FileSystem, HWnd);
CreationParams.Bits, CreationParams.Fullscreen, CreationParams.Stencilbuffer,
FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync,
CreationParams.AntiAlias, CreationParams.DisplayAdapter);
if (!VideoDriver) if (!VideoDriver)
{ {
......
source/Irrlicht/CIrrDeviceWinCE.cpp
View file @ f36090db
...@@ -28,15 +28,13 @@ namespace irr ...@@ -28,15 +28,13 @@ namespace irr
namespace video namespace video
{ {
#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
IVideoDriver* createDirectX8Driver(const core::dimension2d<s32>& screenSize, HWND window, IVideoDriver* createDirectX8Driver(const irr::SIrrlichtCreationParameters& params,
u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, io::IFileSystem* io, HWND window);
bool pureSoftware, bool highPrecisionFPU, bool vsync, bool antiAlias, u32 displayAdapter);
#endif #endif
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
IVideoDriver* createDirectX9Driver(const core::dimension2d<s32>& screenSize, HWND window, IVideoDriver* createDirectX9Driver(const irr::SIrrlichtCreationParameters& params,
u32 bits, bool fullscreen, bool stencilbuffer, io::IFileSystem* io, io::IFileSystem* io, HWND window);
bool pureSoftware, bool highPrecisionFPU, bool vsync, bool antiAlias, u32 displayAdapter);
#endif #endif
#ifdef _IRR_COMPILE_WITH_OPENGL_ #ifdef _IRR_COMPILE_WITH_OPENGL_
...@@ -470,9 +468,7 @@ void CIrrDeviceWinCE::createDriver() ...@@ -470,9 +468,7 @@ void CIrrDeviceWinCE::createDriver()
{ {
case video::EDT_DIRECT3D8: case video::EDT_DIRECT3D8:
#ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_
VideoDriver = video::createDirectX8Driver(CreationParams.WindowSize, HWnd, CreationParams.Bits, CreationParams.Fullscreen, VideoDriver = video::createDirectX8Driver(CreationParams, FileSystem, HWnd);
CreationParams.Stencilbuffer, FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync, CreationParams.AntiAlias
, CreationParams.DisplayAdapter);
if (!VideoDriver) if (!VideoDriver)
{ {
os::Printer::log("Could not create DIRECT3D8 Driver.", ELL_ERROR); os::Printer::log("Could not create DIRECT3D8 Driver.", ELL_ERROR);
...@@ -485,9 +481,7 @@ void CIrrDeviceWinCE::createDriver() ...@@ -485,9 +481,7 @@ void CIrrDeviceWinCE::createDriver()
case video::EDT_DIRECT3D9: case video::EDT_DIRECT3D9:
#ifdef _IRR_COMPILE_WITH_DIRECT3D_9_ #ifdef _IRR_COMPILE_WITH_DIRECT3D_9_
VideoDriver = video::createDirectX9Driver(CreationParams.WindowSize, HWnd, CreationParams.Bits, CreationParams.Fullscreen, VideoDriver = video::createDirectX9Driver(CreationParams, FileSystem, HWnd);
CreationParams.Stencilbuffer, FileSystem, false, CreationParams.HighPrecisionFPU, CreationParams.Vsync, CreationParams.AntiAlias
, CreationParams.DisplayAdapter);
if (!VideoDriver) if (!VideoDriver)
{ {
os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR); os::Printer::log("Could not create DIRECT3D9 Driver.", ELL_ERROR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment