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

Make CD3D9RenderTarget::setTexture code more similar to COpenGLCoreRenderTarget::setTexture.

Browse Source 
Add log warnings when users try to set depth/stencil textures which have no depth color format.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5845 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien 2019-08-15 20:18:45 +00:00
parent 8a33852395
commit 3469582bac
2 changed files with 107 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
source/Irrlicht/CD3D9RenderTarget.cpp
View File

@ -51,136 +51,138 @@ namespace irr
void CD3D9RenderTarget::setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces) void CD3D9RenderTarget::setTexture(const core::array<ITexture*>& texture, ITexture* depthStencil, const core::array<E_CUBE_SURFACE>& cubeSurfaces)
{ {
bool textureUpdate = (Texture != texture) || (CubeSurfaces != cubeSurfaces) ? true : false; bool needSizeUpdate = false;
bool depthStencilUpdate = (DepthStencil != depthStencil) ? true : false;
if (textureUpdate || depthStencilUpdate) // Set color attachments.
if ((Texture != texture) || (CubeSurfaces != cubeSurfaces))
{ {
// Set color attachments. needSizeUpdate = true;
CubeSurfaces = cubeSurfaces;
if (textureUpdate) if (texture.size() > Driver->ActiveRenderTarget.size())
{ {
CubeSurfaces = cubeSurfaces; core::stringc message = "This GPU supports up to ";
message += Driver->ActiveRenderTarget.size();
message += " textures per render target.";
if (texture.size() > Driver->ActiveRenderTarget.size()) os::Printer::log(message.c_str(), ELL_WARNING);
{
core::stringc message = "This GPU supports up to ";
message += Driver->ActiveRenderTarget.size();
message += " textures per render target.";
os::Printer::log(message.c_str(), ELL_WARNING);
}
const u32 size = core::min_(texture.size(), static_cast<u32>(Driver->ActiveRenderTarget.size()));
for (u32 i = 0; i < Surface.size(); ++i)
{
if (Surface[i])
Surface[i]->Release();
}
Surface.set_used(size);
for (u32 i = 0; i < Texture.size(); ++i)
{
if (Texture[i])
Texture[i]->drop();
}
Texture.set_used(size);
for (u32 i = 0; i < size; ++i)
{
CD3D9Texture* currentTexture = (texture[i] && texture[i]->getDriverType() == DriverType) ? static_cast<CD3D9Texture*>(texture[i]) : 0;
IDirect3DTexture9* textureID = 0;
IDirect3DCubeTexture9* cubeTextureId = 0;
UINT level = 0; // no support for rendering to to other mip-levels so far
if (currentTexture)
{
if (currentTexture->getType() == ETT_2D)
textureID = currentTexture->getDX9Texture();
else if ( currentTexture->getType() == ETT_CUBEMAP )
cubeTextureId = currentTexture->getDX9CubeTexture();
}
if (textureID)
{
Texture[i] = texture[i];
Texture[i]->grab();
IDirect3DSurface9* currentSurface = 0;
textureID->GetSurfaceLevel(level, &currentSurface);
Surface[i] = currentSurface;
}
else if ( cubeTextureId )
{
Texture[i] = texture[i];
Texture[i]->grab();
IDirect3DSurface9* currentSurface = 0;
D3DCUBEMAP_FACES face = (D3DCUBEMAP_FACES)CubeSurfaces[i]; // we use same numbering
cubeTextureId->GetCubeMapSurface(face, level, &currentSurface);
Surface[i] = currentSurface;
}
else
{
Surface[i] = 0;
Texture[i] = 0;
}
}
} }
// Set depth and stencil attachments. const u32 size = core::min_(texture.size(), static_cast<u32>(Driver->ActiveRenderTarget.size()));
if (depthStencilUpdate) for (u32 i = 0; i < Surface.size(); ++i)
{ {
if (DepthStencilSurface) if (Surface[i])
{ Surface[i]->Release();
DepthStencilSurface->Release(); }
DepthStencilSurface = 0;
}
if (DepthStencil) Surface.set_used(size);
{
DepthStencil->drop();
DepthStencil = 0;
DepthStencilSurface = 0; for (u32 i = 0; i < Texture.size(); ++i)
} {
if (Texture[i])
Texture[i]->drop();
}
CD3D9Texture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast<CD3D9Texture*>(depthStencil) : 0; Texture.set_used(size);
for (u32 i = 0; i < size; ++i)
{
CD3D9Texture* currentTexture = (texture[i] && texture[i]->getDriverType() == DriverType) ? static_cast<CD3D9Texture*>(texture[i]) : 0;
IDirect3DTexture9* textureID = 0; IDirect3DTexture9* textureID = 0;
IDirect3DCubeTexture9* cubeTextureId = 0;
UINT level = 0; // no support for rendering to to other mip-levels so far
if (currentTexture) if (currentTexture)
{ {
if (currentTexture->getType() == ETT_2D) if (currentTexture->getType() == ETT_2D)
textureID = currentTexture->getDX9Texture(); textureID = currentTexture->getDX9Texture();
else else if ( currentTexture->getType() == ETT_CUBEMAP )
os::Printer::log("This driver doesn't support depth/stencil to cubemaps.", ELL_WARNING); cubeTextureId = currentTexture->getDX9CubeTexture();
} }
if (textureID) if (textureID)
{ {
const ECOLOR_FORMAT textureFormat = (depthStencil) ? depthStencil->getColorFormat() : ECF_UNKNOWN; Texture[i] = texture[i];
Texture[i]->grab();
if (IImage::isDepthFormat(textureFormat)) IDirect3DSurface9* currentSurface = 0;
{ textureID->GetSurfaceLevel(level, &currentSurface);
DepthStencil = depthStencil;
DepthStencil->grab();
IDirect3DSurface9* currentSurface = 0; Surface[i] = currentSurface;
textureID->GetSurfaceLevel(0, &currentSurface); }
else if ( cubeTextureId )
{
Texture[i] = texture[i];
Texture[i]->grab();
DepthStencilSurface = currentSurface; IDirect3DSurface9* currentSurface = 0;
} D3DCUBEMAP_FACES face = (D3DCUBEMAP_FACES)CubeSurfaces[i]; // we use same numbering
cubeTextureId->GetCubeMapSurface(face, level, &currentSurface);
Surface[i] = currentSurface;
}
else
{
Surface[i] = 0;
Texture[i] = 0;
} }
} }
}
// Set depth and stencil attachments.
if (DepthStencil != depthStencil)
{
if (DepthStencilSurface)
{
DepthStencilSurface->Release();
DepthStencilSurface = 0;
}
if (DepthStencil)
{
DepthStencil->drop();
DepthStencil = 0;
DepthStencilSurface = 0;
}
needSizeUpdate = true;
CD3D9Texture* currentTexture = (depthStencil && depthStencil->getDriverType() == DriverType) ? static_cast<CD3D9Texture*>(depthStencil) : 0;
if (currentTexture)
{
if (currentTexture->getType() == ETT_2D)
{
IDirect3DTexture9* textureID = currentTexture->getDX9Texture();
if (textureID)
{
const ECOLOR_FORMAT textureFormat = depthStencil->getColorFormat();
if (IImage::isDepthFormat(textureFormat))
{
DepthStencil = depthStencil;
DepthStencil->grab();
IDirect3DSurface9* currentSurface = 0;
textureID->GetSurfaceLevel(0, &currentSurface);
DepthStencilSurface = currentSurface;
}
else
{
os::Printer::log("Ignoring depth/stencil texture without depth color format.", ELL_WARNING);
}
}
}
else
os::Printer::log("This driver doesn't support depth/stencil to cubemaps.", ELL_WARNING);
}
}
if (needSizeUpdate)
{
// Set size required for a viewport. // Set size required for a viewport.
bool sizeDetected = false; bool sizeDetected = false;

4
source/Irrlicht/COpenGLCoreRenderTarget.h
View File

@ -134,6 +134,10 @@ public:
DepthStencil = depthStencil; DepthStencil = depthStencil;
DepthStencil->grab(); DepthStencil->grab();
} }
else
{
os::Printer::log("Ignoring depth/stencil texture without depth color format.", ELL_WARNING);
}
} }
else else
{ {