TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-27 15:25:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'LinuxCompatabilityFixes' of https://github.com/Bloodknight/Torque3D into development

Browse source
This commit is contained in:
Areloch 2018-03-17 14:07:26 -05:00
commit 5e56d8fdfa
14 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/core/shaders/postFX/fxaa/fxaaV.hlsl
View file

@ -21,7 +21,7 @@
//-----------------------------------------------------------------------------
#include "./../../torque.hlsl"
#include "./../postFX.hlsl"
#include "./../postFx.hlsl"
struct VertToPix
{

2
Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_Blur_P.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "../../ShaderModelAutoGen.hlsl"
#include "../../shaderModelAutoGen.hlsl"
#include "./../postFx.hlsl"
TORQUE_UNIFORM_SAMPLER2D(occludeMap, 0);

2
Templates/BaseGame/game/core/shaders/postFX/ssao/SSAO_P.hlsl
View file

@ -20,7 +20,7 @@
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#include "../../ShaderModelAutoGen.hlsl"
#include "../../shaderModelAutoGen.hlsl"
#include "./../postFx.hlsl"
#define DOSMALL