mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 16:44:36 +00:00
adresses C4189 warnings ('identifier' : local variable is initialized but not referenced)
This commit is contained in:
parent
5fa8504568
commit
76fe7937ce
8 changed files with 8 additions and 51 deletions
|
|
@ -420,7 +420,7 @@ void OggTheoraDecoder::_transcode( th_ycbcr_buffer ycbcr, U8* buffer, const U32
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
#if defined( TORQUE_CPU_X86 )
|
||||||
void OggTheoraDecoder::_transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch )
|
void OggTheoraDecoder::_transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch )
|
||||||
{
|
{
|
||||||
AssertFatal( width % 2 == 0, "OggTheoraDecoder::_transcode420toRGBA_SSE2() - width must be multiple of 2" );
|
AssertFatal( width % 2 == 0, "OggTheoraDecoder::_transcode420toRGBA_SSE2() - width must be multiple of 2" );
|
||||||
|
|
@ -692,3 +692,4 @@ void OggTheoraDecoder::_transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buff
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
@ -172,10 +172,10 @@ class OggTheoraDecoder : public OggDecoder,
|
||||||
/// Generic transcoder going from any of the Y'CbCr pixel formats to
|
/// Generic transcoder going from any of the Y'CbCr pixel formats to
|
||||||
/// any RGB format (that is supported by GFXFormatUtils).
|
/// any RGB format (that is supported by GFXFormatUtils).
|
||||||
void _transcode( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height );
|
void _transcode( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height );
|
||||||
|
#if defined( TORQUE_CPU_X86 )
|
||||||
/// Transcoder with fixed 4:2:0 to RGBA conversion using SSE2 assembly.
|
/// Transcoder with fixed 4:2:0 to RGBA conversion using SSE2 assembly. Unused on 64 bit archetecture.
|
||||||
void _transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch );
|
void _transcode420toRGBA_SSE2( th_ycbcr_buffer ycbcr, U8* buffer, U32 width, U32 height, U32 pitch );
|
||||||
|
#endif
|
||||||
// OggDecoder.
|
// OggDecoder.
|
||||||
virtual bool _detect( ogg_page* startPage );
|
virtual bool _detect( ogg_page* startPage );
|
||||||
virtual bool _init();
|
virtual bool _init();
|
||||||
|
|
|
||||||
|
|
@ -2799,17 +2799,3 @@ void ImposterVertFeatureGLSL::determineFeature( Material *material,
|
||||||
if ( features.hasFeature( MFT_ImposterVert ) )
|
if ( features.hasFeature( MFT_ImposterVert ) )
|
||||||
outFeatureData->features.addFeature( MFT_ImposterVert );
|
outFeatureData->features.addFeature( MFT_ImposterVert );
|
||||||
}
|
}
|
||||||
|
|
||||||
//****************************************************************************
|
|
||||||
// Vertex position
|
|
||||||
//****************************************************************************
|
|
||||||
void DeferredSkyGLSL::processVert( Vector<ShaderComponent*> &componentList,
|
|
||||||
const MaterialFeatureData &fd )
|
|
||||||
{
|
|
||||||
Var *outPosition = (Var*)LangElement::find( "gl_Position" );
|
|
||||||
MultiLine *meta = new MultiLine;
|
|
||||||
//meta->addStatement( new GenOp( " @.w = @.z;\r\n", outPosition, outPosition ) );
|
|
||||||
|
|
||||||
output = meta;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -659,12 +659,4 @@ public:
|
||||||
MaterialFeatureData *outFeatureData );
|
MaterialFeatureData *outFeatureData );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class DeferredSkyGLSL : public ShaderFeatureGLSL
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
virtual String getName() { return "Deferred Shading: Sky"; }
|
|
||||||
virtual void processVert( Vector<ShaderComponent*> &componentList,
|
|
||||||
const MaterialFeatureData &fd );
|
|
||||||
};
|
|
||||||
#endif // _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_
|
#endif // _SHADERGEN_GLSL_SHADERFEATUREGLSL_H_
|
||||||
|
|
|
||||||
|
|
@ -104,7 +104,7 @@ void _initShaderGenGLSL( ShaderGen *shaderGen )
|
||||||
FEATUREMGR->registerFeature( MFT_DeferredSpecVars, new DeferredSpecVarsGLSL );
|
FEATUREMGR->registerFeature( MFT_DeferredSpecVars, new DeferredSpecVarsGLSL );
|
||||||
FEATUREMGR->registerFeature( MFT_DeferredMatInfoFlags, new DeferredMatInfoFlagsGLSL );
|
FEATUREMGR->registerFeature( MFT_DeferredMatInfoFlags, new DeferredMatInfoFlagsGLSL );
|
||||||
FEATUREMGR->registerFeature( MFT_DeferredEmptySpec, new DeferredEmptySpecGLSL );
|
FEATUREMGR->registerFeature( MFT_DeferredEmptySpec, new DeferredEmptySpecGLSL );
|
||||||
FEATUREMGR->registerFeature( MFT_SkyBox, new DeferredSkyGLSL );
|
FEATUREMGR->registerFeature( MFT_SkyBox, new NamedFeatureGLSL( "skybox" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
MODULE_BEGIN( ShaderGenGLSL )
|
MODULE_BEGIN( ShaderGenGLSL )
|
||||||
|
|
|
||||||
|
|
@ -2994,16 +2994,3 @@ void ImposterVertFeatureHLSL::determineFeature( Material *material,
|
||||||
outFeatureData->features.addFeature( MFT_ImposterVert );
|
outFeatureData->features.addFeature( MFT_ImposterVert );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//****************************************************************************
|
|
||||||
// Vertex position
|
|
||||||
//****************************************************************************
|
|
||||||
void DeferredSkyHLSL::processVert( Vector<ShaderComponent*> &componentList,
|
|
||||||
const MaterialFeatureData &fd )
|
|
||||||
{
|
|
||||||
Var *outPosition = (Var*)LangElement::find( "hpos" );
|
|
||||||
MultiLine *meta = new MultiLine;
|
|
||||||
//meta->addStatement( new GenOp( " @.w = @.z;\r\n", outPosition, outPosition ) );
|
|
||||||
|
|
||||||
output = meta;
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -663,13 +663,4 @@ public:
|
||||||
MaterialFeatureData *outFeatureData );
|
MaterialFeatureData *outFeatureData );
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
class DeferredSkyHLSL : public ShaderFeatureHLSL
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
virtual String getName() { return "Deferred Shading: Sky"; }
|
|
||||||
virtual void processVert( Vector<ShaderComponent*> &componentList,
|
|
||||||
const MaterialFeatureData &fd );
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_
|
#endif // _SHADERGEN_HLSL_SHADERFEATUREHLSL_H_
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,7 @@ void _initShaderGenHLSL( ShaderGen *shaderGen )
|
||||||
FEATUREMGR->registerFeature( MFT_DeferredSpecVars, new DeferredSpecVarsHLSL );
|
FEATUREMGR->registerFeature( MFT_DeferredSpecVars, new DeferredSpecVarsHLSL );
|
||||||
FEATUREMGR->registerFeature( MFT_DeferredMatInfoFlags, new DeferredMatInfoFlagsHLSL );
|
FEATUREMGR->registerFeature( MFT_DeferredMatInfoFlags, new DeferredMatInfoFlagsHLSL );
|
||||||
FEATUREMGR->registerFeature( MFT_DeferredEmptySpec, new DeferredEmptySpecHLSL );
|
FEATUREMGR->registerFeature( MFT_DeferredEmptySpec, new DeferredEmptySpecHLSL );
|
||||||
FEATUREMGR->registerFeature( MFT_SkyBox, new DeferredSkyHLSL );
|
FEATUREMGR->registerFeature( MFT_SkyBox, new NamedFeatureHLSL( "skybox" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
MODULE_BEGIN( ShaderGenHLSL )
|
MODULE_BEGIN( ShaderGenHLSL )
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue