Merge pull request #1559 from rextimmy/dx11_clean

Direct3D11 Support
This commit is contained in:
Areloch 2016-03-29 00:51:23 -05:00
commit 6a40b8bb84
395 changed files with 12732 additions and 2452 deletions

View file

@ -209,7 +209,7 @@ bool ProcessedShaderMaterial::init( const FeatureSet &features,
if ( mFeatures.hasFeature( MFT_UseInstancing ) )
{
mInstancingState = new InstancingState();
mInstancingState->setFormat( &_getRPD( 0 )->shader->mInstancingFormat, mVertexFormat );
mInstancingState->setFormat( _getRPD( 0 )->shader->getInstancingFormat(), mVertexFormat );
}
return true;
}