Integrating latest 47acbe8

Code/CryEngine/RenderDll/Common/Shaders/ParserBin.cpp

@@ -728,7 +728,6 @@ void CParserBin::Init()
     FX_REGISTER_TOKEN(24);
 
     FX_REGISTER_TOKEN(ORBIS);
-    FX_REGISTER_TOKEN(DURANGO);
     FX_REGISTER_TOKEN(PCDX11);
     FX_REGISTER_TOKEN(GL4);
     FX_REGISTER_TOKEN(GLES3);
@@ -1103,26 +1102,6 @@ void CParserBin::SetupForJasper()
     gRenDev->m_cEF.m_pGlobalExt = gRenDev->m_cEF.mfCreateShaderGenInfo("RunTime", true);
 }
 
-void CParserBin::SetupForDurango()
-{
-    CleanPlatformMacros();
-    SetupTargetPlatform();
-    uint32 nMacro[1] = {eT_1};
-
-    m_nPlatform = SF_DURANGO;
-
-    SetupShadersCacheAndFilter();
-
-    AddMacro(CParserBin::fxToken("DURANGO"), nMacro, 1, 0, m_StaticMacros);
-
-    SetupFeatureDefines();
-    gRenDev->m_cEF.m_Bin.InvalidateCache();
-    gRenDev->m_cEF.mfInitLookups();
-
-    SAFE_DELETE(gRenDev->m_cEF.m_pGlobalExt);
-    gRenDev->m_cEF.m_pGlobalExt = gRenDev->m_cEF.mfCreateShaderGenInfo("RunTime", true);
-}
-
 CCryNameTSCRC CParserBin::GetPlatformSpecName(CCryNameTSCRC orgName)
 {
     CCryNameTSCRC nmTemp = orgName;
@@ -1313,7 +1292,6 @@ bool CParserBin::RemoveMacro(uint32 dwName, FXMacroBin& Macro)
 
 void CParserBin::CleanPlatformMacros()
 {
-    RemoveMacro(CParserBin::fxToken("DURANGO"), m_StaticMacros);
     RemoveMacro(CParserBin::fxToken("ORBIS"), m_StaticMacros);
     RemoveMacro(CParserBin::fxToken("PCDX11"), m_StaticMacros);
     RemoveMacro(CParserBin::fxToken("GL4"), m_StaticMacros);
@@ -3682,7 +3660,7 @@ void CParserBin::SetupFeatureDefines()
 
     uint32 nEnable[1] = { eT_1 };
 #if defined(MESH_TESSELLATION)
-    if (m_nPlatform == SF_D3D11 || m_nPlatform == SF_DURANGO || m_nPlatform == SF_GL4)
+    if (m_nPlatform == SF_D3D11 || m_nPlatform == SF_GL4)
     {
         AddMacro(CParserBin::GetCRC32("FEATURE_MESH_TESSELLATION"), nEnable, 1, 0, m_StaticMacros);
     }
@@ -3696,13 +3674,13 @@ void CParserBin::SetupFeatureDefines()
     }
 #endif
 #if defined(PARTICLES_TESSELLATION)
-    if (m_nPlatform == SF_D3D11 || m_nPlatform == SF_DURANGO || m_nPlatform == SF_JASPER || m_nPlatform == SF_ORBIS || m_nPlatform == SF_GL4)
+    if (m_nPlatform == SF_D3D11 || m_nPlatform == SF_JASPER || m_nPlatform == SF_ORBIS || m_nPlatform == SF_GL4)
     {
         AddMacro(CParserBin::GetCRC32("FEATURE_PARTICLES_TESSELLATION"), nEnable, 1, 0, m_StaticMacros);
     }
 #endif
 
-    if (m_nPlatform == SF_DURANGO || m_nPlatform == SF_JASPER || m_nPlatform == SF_ORBIS || m_nPlatform == SF_D3D11 || m_nPlatform == SF_GL4 || m_nPlatform == SF_GLES3 || m_nPlatform == SF_METAL)
+    if (m_nPlatform == SF_JASPER || m_nPlatform == SF_ORBIS || m_nPlatform == SF_D3D11 || m_nPlatform == SF_GL4 || m_nPlatform == SF_GLES3 || m_nPlatform == SF_METAL)
     {
         AddMacro(CParserBin::GetCRC32("FEATURE_SPI_CONSTANT_BUFFERS"), nEnable, 1, 0, m_StaticMacros);
     }
@@ -3714,7 +3692,7 @@ void CParserBin::SetupFeatureDefines()
 #endif
     }
 
-    if (m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_DURANGO | SF_JASPER | SF_GL4))
+    if (m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_JASPER | SF_GL4))
     {
         AddMacro(CParserBin::GetCRC32("FEATURE_GEOMETRY_SHADERS"), nEnable, 1, 0, m_StaticMacros);
     }
@@ -3723,7 +3701,7 @@ void CParserBin::SetupFeatureDefines()
     AddMacro(CParserBin::GetCRC32("FEATURE_SVO_GI"), nEnable, 1, 0, m_StaticMacros);
 #endif
 
-    if (m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_DURANGO | SF_JASPER | SF_GL4))
+    if (m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_JASPER | SF_GL4))
     {
         AddMacro(CParserBin::GetCRC32("FEATURE_DUAL_SOURCE_BLENDING"), nEnable, 1, 0, m_StaticMacros);
     }
@@ -3734,7 +3712,7 @@ void CParserBin::SetupFeatureDefines()
     const bool isMacOpenGl = false;
 #endif
 
-    if ((m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_DURANGO | SF_JASPER)) || (isMacOpenGl == false && m_nPlatform & (SF_GL4)))
+    if ((m_nPlatform & (SF_D3D11 | SF_ORBIS | SF_JASPER)) || (isMacOpenGl == false && m_nPlatform & (SF_GL4)))
     {
         // Disable FEATURE_8_BONE_SKINNING because structurebuffer sb_SkinExtraBlendWeights is not handled in the code currently.
         // AddMacro(CParserBin::GetCRC32("FEATURE_8_BONE_SKINNING"), nEnable, 1, 0, m_StaticMacros);