TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add GFXShader::init with support for ordered vector of sampler names for shader.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-04-17 20:29:44 +02:00
parent 938e28b6f3
commit 086c6b5416
2 changed files with 30 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/gfx/gfxShader.cpp
View file

@ -45,16 +45,29 @@ GFXShader::~GFXShader()
Torque::FS::RemoveChangeNotification( mPixelFile, this, &GFXShader::_onFileChanged );
}
#ifndef TORQUE_OPENGL
bool GFXShader::init( const Torque::Path &vertFile,
const Torque::Path &pixFile,
F32 pixVersion,
const Vector<GFXShaderMacro> &macros )
{
Vector<String> samplerNames;
return init( vertFile, pixFile, pixVersion, macros, samplerNames );
}
#endif
bool GFXShader::init( const Torque::Path &vertFile,
const Torque::Path &pixFile,
F32 pixVersion,
const Vector<GFXShaderMacro> &macros,
const Vector<String> &samplerNames)
{
// Store the inputs for use in reloading.
mVertexFile = vertFile;
mPixelFile = pixFile;
mPixVersion = pixVersion;
mMacros = macros;
mSamplerNamesOrdered = samplerNames;
// Before we compile the shader make sure the
// conditioner features have been updated.