MoNTE48
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Temporarily disabled the non-alpha textures for d3d due to lack of mipmap support. Have to fix that first. 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@802 dfc29bdd-3216-0410-991c-e03cc46cb475
master
hybrid 2007-07-19 23:57:14 +00:00
parent b9f96332bd
commit 37d2363843
2 changed files with 39 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/Irrlicht/CD3D8Texture.cpp
View File

@ -153,7 +153,7 @@ bool CD3D8Texture::createTexture(u32 flags)
case ETCF_OPTIMIZED_FOR_SPEED:
format = D3DFMT_A1R5G5B5; break;
}
if (Driver->getTextureCreationFlag(video::ETCF_NO_ALPHA_CHANNEL))
if (false && Driver->getTextureCreationFlag(video::ETCF_NO_ALPHA_CHANNEL))
{
if (format == D3DFMT_A8R8G8B8)
format = D3DFMT_R8G8B8;
@ -179,7 +179,7 @@ bool CD3D8Texture::createTexture(u32 flags)
hr = Device->CreateTexture(optSize.Width, optSize.Height,
mipmaps ? 0 : 1, // number of mipmaplevels (0 = automatic all)
0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &Texture);
0, format, D3DPOOL_MANAGED, &Texture);
}
ColorFormat = getColorFormatFromD3DFormat(format);
@ -199,30 +199,23 @@ bool CD3D8Texture::copyTexture()
TextureSize.Width = desc.Width;
TextureSize.Height = desc.Height;
if ((desc.Format == D3DFMT_A1R5G5B5) || (desc.Format == D3DFMT_A8R8G8B8))
D3DLOCKED_RECT rect;
HRESULT hr = Texture->LockRect(0, &rect, 0, 0);
if (FAILED(hr))
{
D3DLOCKED_RECT rect;
HRESULT hr = Texture->LockRect(0, &rect, 0, 0);
if (FAILED(hr))
{
os::Printer::log("Could not lock D3D8 Texture.", ELL_ERROR);
return false;
}
Pitch = rect.Pitch;
Image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
hr = Texture->UnlockRect(0);
if (FAILED(hr))
{
os::Printer::log("Could not unlock D3D8 Texture.", ELL_ERROR);
return false;
}
return true;
os::Printer::log("Could not lock D3D8 Texture.", ELL_ERROR);
return false;
}
Pitch = rect.Pitch;
Image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
hr = Texture->UnlockRect(0);
if (FAILED(hr))
{
os::Printer::log("Could not unlock D3D8 Texture.", ELL_ERROR);
return false;
}
else
os::Printer::log("CD3D8Texture: Unsupported D3D8 hardware texture format", ELL_ERROR);
}
return true;

48
source/Irrlicht/CD3D9Texture.cpp
View File

@ -228,7 +228,7 @@ bool CD3D9Texture::createMipMaps(u32 level)
}
else
{
if (upperDesc.Format == D3DFMT_A1R5G5B5)
if ((upperDesc.Format == D3DFMT_A1R5G5B5) || (upperDesc.Format == D3DFMT_R5G6B5))
copy16BitMipMap((char*)upperlr.pBits, (char*)lowerlr.pBits,
lowerDesc.Width, lowerDesc.Height,
upperlr.Pitch, lowerlr.Pitch);
@ -301,7 +301,7 @@ bool CD3D9Texture::createTexture(u32 flags)
default:
break;
}
if (Driver->getTextureCreationFlag(video::ETCF_NO_ALPHA_CHANNEL))
if (false && Driver->getTextureCreationFlag(video::ETCF_NO_ALPHA_CHANNEL))
{
if (format == D3DFMT_A8R8G8B8)
format = D3DFMT_R8G8B8;
@ -340,7 +340,7 @@ bool CD3D9Texture::createTexture(u32 flags)
hr = Device->CreateTexture(optSize.Width, optSize.Height,
mipmaps ? 0 : 1, // number of mipmaplevels (0 = automatic all)
0, D3DFMT_A1R5G5B5, D3DPOOL_MANAGED, &Texture, NULL);
0, format, D3DPOOL_MANAGED, &Texture, NULL);
}
ColorFormat = getColorFormatFromD3DFormat(format);
@ -401,30 +401,23 @@ bool CD3D9Texture::copyTexture()
TextureSize.Width = desc.Width;
TextureSize.Height = desc.Height;
if ((desc.Format == D3DFMT_A1R5G5B5) || (desc.Format == D3DFMT_A8R8G8B8))
D3DLOCKED_RECT rect;
HRESULT hr = Texture->LockRect(0, &rect, 0, 0);
if (FAILED(hr))
{
D3DLOCKED_RECT rect;
HRESULT hr = Texture->LockRect(0, &rect, 0, 0);
if (FAILED(hr))
{
os::Printer::log("Could not lock D3D9 Texture.", ELL_ERROR);
return false;
}
Pitch = rect.Pitch;
Image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
hr = Texture->UnlockRect(0);
if (FAILED(hr))
{
os::Printer::log("Could not unlock D3D9 Texture.", ELL_ERROR);
return false;
}
return true;
os::Printer::log("Could not lock D3D9 Texture.", ELL_ERROR);
return false;
}
Pitch = rect.Pitch;
Image->copyToScaling(rect.pBits, TextureSize.Width, TextureSize.Height, ColorFormat, Pitch);
hr = Texture->UnlockRect(0);
if (FAILED(hr))
{
os::Printer::log("Could not unlock D3D9 Texture.", ELL_ERROR);
return false;
}
else
os::Printer::log("CD3D9Texture: Unsupported D3D9 hardware texture format", ELL_ERROR);
}
return true;
@ -597,7 +590,10 @@ void CD3D9Texture::copy16BitMipMap(char* src, char* tgt,
g /= 4;
b /= 4;
c = ((a & 0x1) <<15) | ((r & 0x1F)<<10) | ((g & 0x1F)<<5) | (b & 0x1F);
if (ColorFormat == ECF_A1R5G5B5)
c = RGBA16(r,g,b,a);
else
c = A8R8G8B8toR5G6B5(SColor(a,r,g,b).color);
*(u16*)((void*)&tgt[(x*2)+(y*pitchtgt)]) = c;
}
}