Commit d9a73b87 authored by bitplane's avatar bitplane

Fix a bug when getting optimal texture size in D3D drivers, by Jetro Lauha (tonic)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2616 dfc29bdd-3216-0410-991c-e03cc46cb475
parent cd7ad09b
Changes in 1.6 (??.??.2009) Changes in 1.6 (??.??.2009)
- Fix a bug when getting optimal texture size in D3D drivers, by Jetro Lauha (tonic)
- Added EGDS_TITLEBARTEXT_DISTANCE_X and EGDS_TITLEBARTEXT_DISTANCE_Y to GUI, submitted by FuzzYspo0N - Added EGDS_TITLEBARTEXT_DISTANCE_X and EGDS_TITLEBARTEXT_DISTANCE_Y to GUI, submitted by FuzzYspo0N
- Fix for UFT8 filenames displayed in file dialog, patch by MadHyde. - Fix for UFT8 filenames displayed in file dialog, patch by MadHyde.
......
...@@ -114,7 +114,7 @@ bool CD3D8Texture::createTexture(video::IImage* image, u32 flags) ...@@ -114,7 +114,7 @@ bool CD3D8Texture::createTexture(video::IImage* image, u32 flags)
{ {
ImageSize = image->getDimension(); ImageSize = image->getDimension();
core::dimension2d<u32> optSize = ImageSize.getOptimalSize(Driver->queryFeature(EVDF_TEXTURE_NPOT), Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth); core::dimension2d<u32> optSize = ImageSize.getOptimalSize(!Driver->queryFeature(EVDF_TEXTURE_NPOT), !Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth);
D3DFORMAT format = D3DFMT_A1R5G5B5; D3DFORMAT format = D3DFMT_A1R5G5B5;
switch(getTextureFormatFromFlags(flags)) switch(getTextureFormatFromFlags(flags))
...@@ -539,7 +539,7 @@ void CD3D8Texture::copy32BitMipMap(char* src, char* tgt, ...@@ -539,7 +539,7 @@ void CD3D8Texture::copy32BitMipMap(char* src, char* tgt,
void CD3D8Texture::createRenderTarget() void CD3D8Texture::createRenderTarget()
{ {
TextureSize = TextureSize.getOptimalSize(Driver->queryFeature(EVDF_TEXTURE_NPOT), Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth); TextureSize = TextureSize.getOptimalSize(!Driver->queryFeature(EVDF_TEXTURE_NPOT), !Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth);
// get backbuffer format to create the render target in the // get backbuffer format to create the render target in the
// same format // same format
......
...@@ -124,7 +124,7 @@ void CD3D9Texture::createRenderTarget(const ECOLOR_FORMAT format) ...@@ -124,7 +124,7 @@ void CD3D9Texture::createRenderTarget(const ECOLOR_FORMAT format)
if (TextureSize != ImageSize) if (TextureSize != ImageSize)
os::Printer::log("RenderTarget size has to be a power of two", ELL_INFORMATION); os::Printer::log("RenderTarget size has to be a power of two", ELL_INFORMATION);
} }
TextureSize = TextureSize.getOptimalSize(Driver->queryFeature(EVDF_TEXTURE_NPOT), Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth); TextureSize = TextureSize.getOptimalSize(!Driver->queryFeature(EVDF_TEXTURE_NPOT), !Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth);
D3DFORMAT d3dformat = Driver->getD3DColorFormat(); D3DFORMAT d3dformat = Driver->getD3DColorFormat();
...@@ -279,7 +279,7 @@ bool CD3D9Texture::createTexture(u32 flags, IImage * image) ...@@ -279,7 +279,7 @@ bool CD3D9Texture::createTexture(u32 flags, IImage * image)
{ {
ImageSize = image->getDimension(); ImageSize = image->getDimension();
core::dimension2d<u32> optSize = ImageSize.getOptimalSize(Driver->queryFeature(EVDF_TEXTURE_NPOT), Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth); core::dimension2d<u32> optSize = ImageSize.getOptimalSize(!Driver->queryFeature(EVDF_TEXTURE_NPOT), !Driver->queryFeature(EVDF_TEXTURE_NSQUARE), true, Driver->Caps.MaxTextureWidth);
D3DFORMAT format = D3DFMT_A1R5G5B5; D3DFORMAT format = D3DFMT_A1R5G5B5;
......
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