1
0
forked from 0ad/0ad

- tex_dds: fix comment; enable warning on unsupported formats

- renderer: avoid particle-emitter memory leak warnings

This was SVN commit r3639.
This commit is contained in:
Ykkrosh 2006-03-15 18:32:24 +00:00
parent 8438a45948
commit 26dc8cc4c8
4 changed files with 7 additions and 5 deletions

View File

@ -425,13 +425,13 @@ static LibError decode_pf(const DDPIXELFORMAT* pf, uint* bpp_, uint* flags_)
{
// DDPIXELFORMAT in theory supports any ordering of R,G,B,A.
// we need to upload to OpenGL, which can only receive BGR(A) or
// RBG(A). the former still requires conversion (done by driver),
// RGB(A). the former still requires conversion (done by driver),
// so it's slower. since the very purpose of supporting uncompressed
// DDS is storing images in a format that requires no processessing,
// DDS is storing images in a format that requires no processing,
// we do not allow any weird orderings that require runtime work.
// instead, the artists must export with the correct settings.
unsupported_component_ordering:
/*/*WARN_RETURN(ERR_TEX_FMT_INVALID)*/;
WARN_RETURN(ERR_TEX_FMT_INVALID);
}
CHECK_ERR(tex_validate_plain_format(bpp, flags));

View File

@ -333,6 +333,8 @@ CRenderer::~CRenderer()
delete m_VertexShader;
m_VertexShader = 0;
CParticleEngine::GetInstance()->cleanup();
// we no longer UnloadAlphaMaps / UnloadWaterTextures here -
// that is the responsibility of the module that asked for
// them to be loaded (i.e. CGameView).