TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflict resolution with devhead.

Browse source 
Cleaned up a few remaining d3d9 references in the cmake file.
This commit is contained in:
Areloch 2017-06-01 23:54:44 -05:00
commit 23fb9ba38b
84 changed files with 362 additions and 10427 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/renderInstance/renderDeferredMgr.cpp
View file

@ -1029,7 +1029,21 @@ Var* LinearEyeDepthConditioner::printMethodHeader( MethodType methodType, const
Var *deferredSampler = new Var;
deferredSampler->setName("deferredSamplerVar");
deferredSampler->setType("sampler2D");
DecOp *deferredSamplerDecl = new DecOp(deferredSampler);
DecOp *deferredSamplerDecl = NULL;
Var *deferredTex = NULL;
DecOp *deferredTexDecl = NULL;
if (GFX->getAdapterType() == Direct3D11)
{
deferredSampler->setType("SamplerState");
deferredTex = new Var;
deferredTex->setName("deferredTexVar");
deferredTex->setType("Texture2D");
deferredTexDecl = new DecOp(deferredTex);
}
deferredSamplerDecl = new DecOp(deferredSampler);
Var *screenUV = new Var;
screenUV->setName("screenUVVar");