Skip to content

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

Some simplifications in d3d texture code. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@733 dfc29bdd-3216-0410-991c-e03cc46cb475
parent ecbe186f
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 61 deletions
source/Irrlicht/CD3D8Texture.cpp
View file @ 65a1407b
......@@ -69,9 +69,7 @@ HasMipMaps(false), IsRenderTarget(false)
{
Image->grab();
createTexture(flags);
if (Texture)
if (createTexture(flags))
{
if (copyTexture() && generateMipLevels)
{
......@@ -101,7 +99,7 @@ HasMipMaps(false), IsRenderTarget(false)
//! creates the hardware texture
void CD3D8Texture::createTexture(u32 flags)
bool CD3D8Texture::createTexture(u32 flags)
{
core::dimension2d<s32> optSize;
ImageSize = Image->getDimension();
......@@ -157,7 +155,8 @@ void CD3D8Texture::createTexture(u32 flags)
0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &Texture);
}
ColorFormat = (format == D3DFMT_A1R5G5B5) ? ECF_A1R5G5B5 : ECF_A8R8G8B8;
ColorFormat = getColorFormatFromD3DFormat(format);
return (SUCCEEDED(hr));
}
......@@ -391,12 +390,14 @@ bool CD3D8Texture::hasMipMaps() const
}
bool CD3D8Texture::createMipMaps(s32 level)
// 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.
bool CD3D8Texture::createMipMaps(u32 level)
{
// 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.
if (level==0)
return;
IDirect3DSurface8* upperSurface = 0;
IDirect3DSurface8* lowerSurface = 0;
......@@ -477,6 +478,31 @@ bool CD3D8Texture::createMipMaps(s32 level)
}
ECOLOR_FORMAT CD3D8Texture::getColorFormatFromD3DFormat(D3DFORMAT format)
{
switch(format)
{
case D3DFMT_X1R5G5B5:
case D3DFMT_A1R5G5B5:
Pitch = TextureSize.Width * 2;
return ECF_A1R5G5B5;
break;
case D3DFMT_A8B8G8R8:
case D3DFMT_A8R8G8B8:
case D3DFMT_X8R8G8B8:
Pitch = TextureSize.Width * 4;
return ECF_A8R8G8B8;
break;
case D3DFMT_R5G6B5:
Pitch = TextureSize.Width * 2;
return ECF_R5G6B5;
break;
default:
return (ECOLOR_FORMAT)0;
};
}
void CD3D8Texture::copy16BitMipMap(char* src, char* tgt,
s32 width, s32 height,
......@@ -601,26 +627,7 @@ void CD3D8Texture::createRenderTarget()
&Texture);
// get irrlicht format from D3D format
switch(d3DFormat)
{
case D3DFMT_X1R5G5B5:
case D3DFMT_A1R5G5B5:
ColorFormat = ECF_A1R5G5B5;
Pitch = TextureSize.Width * 2;
break;
case D3DFMT_A8R8G8B8:
case D3DFMT_X8R8G8B8:
ColorFormat = ECF_A8R8G8B8;
Pitch = TextureSize.Width * 4;
break;
case D3DFMT_R5G6B5:
ColorFormat = ECF_R5G6B5;
Pitch = TextureSize.Width * 2;
break;
default:
ColorFormat = (ECOLOR_FORMAT)-1;
};
ColorFormat = getColorFormatFromD3DFormat(d3DFormat);
if (FAILED(hr))
os::Printer::log("Could not create render target texture");
......
source/Irrlicht/CD3D8Texture.h
View file @ 65a1407b
......@@ -81,18 +81,21 @@ private:
inline s32 getTextureSizeFromImageSize(s32 size);
//! creates the hardware texture
void createTexture(u32 flags);
bool createTexture(u32 flags);
//! copies the image to the texture
bool copyTexture();
//! convert color formats
ECOLOR_FORMAT getColorFormatFromD3DFormat(D3DFORMAT format);
//! optimized for 16 bit to 16 copy.
bool copyTo16BitTexture();
//! copies texture to 32 bit hardware texture
bool copyTo32BitTexture();
bool createMipMaps(s32 level=1);
bool createMipMaps(u32 level=1);
void copy16BitMipMap(char* src, char* tgt,
s32 width, s32 height, s32 pitchsrc, s32 pitchtgt);
......
source/Irrlicht/CD3D9Texture.cpp
View file @ 65a1407b
......@@ -68,9 +68,7 @@ HasMipMaps(false), HardwareMipMaps(false), IsRenderTarget(false)
{
Image->grab();
createTexture(flags);
if (Texture)
if (createTexture(flags))
{
if (copyTexture() && generateMipLevels)
{
......@@ -140,35 +138,17 @@ void CD3D9Texture::createRenderTarget()
NULL);
// get irrlicht format from D3D format
switch(d3DFormat)
{
case D3DFMT_X1R5G5B5:
case D3DFMT_A1R5G5B5:
ColorFormat = ECF_A1R5G5B5;
Pitch = TextureSize.Width * 2;
break;
case D3DFMT_A8B8G8R8:
case D3DFMT_A8R8G8B8:
case D3DFMT_X8R8G8B8:
ColorFormat = ECF_A8R8G8B8;
Pitch = TextureSize.Width * 4;
break;
case D3DFMT_R5G6B5:
ColorFormat = ECF_R5G6B5;
Pitch = TextureSize.Width * 2;
break;
default:
ColorFormat = (ECOLOR_FORMAT)-1;
};
ColorFormat = getColorFormatFromD3DFormat(d3DFormat);
if (FAILED(hr))
os::Printer::log("Could not create render target texture");
}
bool CD3D9Texture::createMipMaps(s32 level)
bool CD3D9Texture::createMipMaps(u32 level)
{
if (level==0)
return;
if (HardwareMipMaps && Texture)
{
// generate mipmaps in hardware
......@@ -263,7 +243,7 @@ bool CD3D9Texture::createMipMaps(s32 level)
//! creates the hardware texture
void CD3D9Texture::createTexture(u32 flags)
bool CD3D9Texture::createTexture(u32 flags)
{
core::dimension2d<s32> optSize;
ImageSize = Image->getDimension();
......@@ -335,10 +315,35 @@ void CD3D9Texture::createTexture(u32 flags)
0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &Texture, NULL);
}
ColorFormat = (format == D3DFMT_A1R5G5B5) ? ECF_A1R5G5B5 : ECF_A8R8G8B8;
ColorFormat = getColorFormatFromD3DFormat(format);
return (SUCCEEDED(hr));
}
ECOLOR_FORMAT CD3D9Texture::getColorFormatFromD3DFormat(D3DFORMAT format)
{
switch(format)
{
case D3DFMT_X1R5G5B5:
case D3DFMT_A1R5G5B5:
Pitch = TextureSize.Width * 2;
return ECF_A1R5G5B5;
break;
case D3DFMT_A8B8G8R8:
case D3DFMT_A8R8G8B8:
case D3DFMT_X8R8G8B8:
Pitch = TextureSize.Width * 4;
return ECF_A8R8G8B8;
break;
case D3DFMT_R5G6B5:
Pitch = TextureSize.Width * 2;
return ECF_R5G6B5;
break;
default:
return (ECOLOR_FORMAT)0;
};
}
//! copies the image to the texture
bool CD3D9Texture::copyTexture()
......
source/Irrlicht/CD3D9Texture.h
View file @ 65a1407b
......@@ -80,18 +80,21 @@ private:
inline s32 getTextureSizeFromImageSize(s32 size);
//! creates the hardware texture
void createTexture(u32 flags);
bool createTexture(u32 flags);
//! copies the image to the texture
bool copyTexture();
//! convert color formats
ECOLOR_FORMAT getColorFormatFromD3DFormat(D3DFORMAT format);
//! optimized for 16 bit to 16 copy.
bool copyTo16BitTexture();
//! copies texture to 32 bit hardware texture
bool copyTo32BitTexture();
bool createMipMaps(s32 level=1);
bool createMipMaps(u32 level=1);
void copy16BitMipMap(char* src, char* tgt,
s32 width, s32 height, s32 pitchsrc, s32 pitchtgt);
......
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